git

git:pu

Last commit made on 2019-12-10
Get this branch:
git clone -b pu https://git.launchpad.net/git

Branch merges

Branch information

Name:
pu
Repository:
lp:git

Recent commits

ca3ba2c... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'sg/t9300-robustify' into pu

The test on "fast-import" used to get stuck when "fast-import" died
in the middle.

* sg/t9300-robustify:
  t9300-fast-import: don't hang if background fast-import exits too early
  t9300-fast-import: store the PID in a variable instead of pidfile

0341d5f... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'ds/sparse-cone' into pu

Management of sparsely checked-out working tree has gained a
dedicated "sparse-checkout" command.

Possibly wait for Szeder?
cf. <email address hidden>

* ds/sparse-cone:
  sparse-checkout: check for dirty status
  sparse-checkout: update working directory in-process for 'init'
  sparse-checkout: cone mode should not interact with .gitignore
  sparse-checkout: write using lockfile
  sparse-checkout: use in-process update for disable subcommand
  sparse-checkout: update working directory in-process
  sparse-checkout: sanitize for nested folders
  unpack-trees: add progress to clear_ce_flags()
  unpack-trees: hash less in cone mode
  sparse-checkout: init and set in cone mode
  sparse-checkout: use hashmaps for cone patterns
  sparse-checkout: add 'cone' mode
  trace2: add region in clear_ce_flags
  sparse-checkout: create 'disable' subcommand
  sparse-checkout: add '--stdin' option to set subcommand
  sparse-checkout: 'set' subcommand
  clone: add --sparse mode
  sparse-checkout: create 'init' subcommand
  sparse-checkout: create builtin with 'list' subcommand

1860a9f... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'jn/unknown-index-extensions' into pu

A bit too alarming warning given when unknown index extensions
exist is getting revamped.

* jn/unknown-index-extensions:
  index: offer advice for unknown index extensions
  index: do not warn about unrecognized extensions

b69330b... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'vn/reset-deleted-ita' into pu

"git reset HEAD [<pathspec>]" did not reset an empty file that was
added with the intent-to-add bit.

* vn/reset-deleted-ita:
  reset: unstage empty deleted ita files

d684bc6... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'mt/threaded-grep-in-object-store' into pu

Traditionally, we avoided threaded grep while searching in objects
(as opposed to files in the working tree) as accesses to the object
layer is not thread-safe. This limitation is getting lifted.

* mt/threaded-grep-in-object-store:
  grep: move driver pre-load out of critical section
  grep: re-enable threads in non-worktree case
  grep: protect packed_git [re-]initialization
  grep: allow submodule functions to run in parallel
  submodule-config: add skip_if_read option to repo_read_gitmodules()
  grep: replace grep_read_mutex by internal obj read lock
  object-store: allow threaded access to object reading
  replace-object: make replace operations thread-safe
  grep: fix racy calls in grep_objects()
  grep: fix race conditions at grep_submodule()
  grep: fix race conditions on userdiff calls

814ba9d... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'js/protocol-advertise-multi' into pu

The transport layer has been updated so that the protocol version
used can be negotiated between the parties, by the initiator
listing the protocol versions it is willing to talk, and the other
side choosing from one of them.

* js/protocol-advertise-multi:
  protocol: advertise multiple supported versions

8baebaf... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'mk/use-size-t-in-zlib' into pu

The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".

* mk/use-size-t-in-zlib:
  zlib.c: use size_t for size

4708347... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'jc/format-patch-delay-message-id' into pu

The location "git format-patch --thread" adds the Message-Id:
header in the series of header fields has been moved down, which
may help working around a suspected bug in GMail MSA, reported at
<email address hidden>

* jc/format-patch-delay-message-id:
  format-patch: move message-id and related headers to the end

e0fa0b1... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'js/add-i-a-bit-more-tests' into pu

Test coverage update in preparation for further work on "git add -i".

* js/add-i-a-bit-more-tests:
  apply --allow-overlap: fix a corner case
  git add -p: use non-zero exit code when the diff generation failed
  t3701: verify that the diff.algorithm config setting is handled
  t3701: verify the shown messages when nothing can be added
  t3701: add a test for the different `add -p` prompts
  t3701: avoid depending on the TTY prerequisite
  t3701: add a test for advanced split-hunk editing

8c99625... by Junio C Hamano <email address hidden> 12 hours ago

Merge branch 'pw/advise-rebase-skip' into pu

The mechanism to prevent "git commit" from making an empty commit
or amending during an interrupted cherry-pick was broken during the
rewrite of "git rebase" in C, which has been corrected.

* pw/advise-rebase-skip:
  rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
  rebase: fix advice when a fixup creates an empty commit
  commit: give correct advice for empty commit during a rebase
  commit: encapsulate determine_whence() for sequencer
  commit: use enum value for multiple cherry-picks
  sequencer: write CHERRY_PICK_HEAD for reword and edit
  cherry-pick: check commit error messages
  cherry-pick: add test for `--skip` advice in `git commit`
  t3404: use test_cmp_rev