git

git:pu

Last commit made on 2020-06-01
Get this branch:
git clone -b pu https://git.launchpad.net/git

Branch merges

Branch information

Name:
pu
Repository:
lp:git

Recent commits

b8e61f1... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'xl/upgrade-repo-format' into pu

Allow runtime upgrade of the repository format version, which needs
to be done carefully.

Almost there.

* xl/upgrade-repo-format:
  fetch: allow adding a filter after initial clone

f0b1782... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'cc/upload-pack-data-2' into pu

Further code clean-up.

* cc/upload-pack-data-2:
  upload-pack: move pack_objects_hook to upload_pack_data
  upload-pack: move allow_sideband_all to upload_pack_data
  upload-pack: move allow_ref_in_want to upload_pack_data
  upload-pack: move allow_filter to upload_pack_data
  upload-pack: move keepalive to upload_pack_data
  upload-pack: pass upload_pack_data to upload_pack_config()
  upload-pack: change multi_ack to an enum
  upload-pack: move multi_ack to upload_pack_data
  upload-pack: move filter_capability_requested to upload_pack_data
  upload-pack: move use_sideband to upload_pack_data
  upload-pack: move static vars to upload_pack_data
  upload-pack: actually use some upload_pack_data bitfields

d8c1e41... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'dl/test-must-fail-fixes-5' into pu

The effort to avoid using test_must_fail on non-git command continues.

* dl/test-must-fail-fixes-5:
  lib-submodule-update: pass OVERWRITING_FAIL
  SQUASH??? <20200521112545.GB581643@generichostname>
  lib-submodule-update: prepend "git" to $command
  lib-submodule-update: consolidate --recurse-submodules
  lib-submodule-update: add space after function name

e26f318... by Junio C Hamano <email address hidden> on 2020-06-01

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

58afd65... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'mr/bisect-in-c-2' into pu

Rewrite of the remainder of "git bisect" script in C continues.

* mr/bisect-in-c-2:
  bisect--helper: retire `--bisect-autostart` subcommand
  bisect--helper: retire `--write-terms` subcommand
  bisect--helper: retire `--check-expected-revs` subcommand
  bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
  bisect--helper: retire `--next-all` subcommand
  bisect--helper: retire `--bisect-clean-state` subcommand
  bisect--helper: finish porting `bisect_start()` to C
  bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
  bisect--helper: reimplement `bisect_autostart` shell function in C
  bisect--helper: introduce new `write_in_file()` function
  bisect--helper: use '-res' in 'cmd_bisect__helper' return
  bisect--helper: fix `cmd_*()` function switch default return

066fee1... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'jx/proc-receive-hook' into pu

"git receive-pack" that accepts requests by "git push" learned to
outsource most of the ref updates to the new "proc-receive" hook.

* jx/proc-receive-hook:
  doc: add documentation for the proc-receive hook
  transport: parse report options for tracking refs
  t5411: test updates of remote-tracking branches
  receive-pack: new config receive.procReceiveRefs
  refs.c: refactor to reuse ref_is_hidden()
  receive-pack: feed report options to post-receive
  doc: add document for capability report-status-v2
  New capability "report-status-v2" for git-push
  receive-pack: add new proc-receive hook
  t5411: add basic test cases for proc-receive hook
  transport: not report a non-head push as a branch

d6e4935... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'mt/grep-sparse-checkout' into pu

"git grep" has been tweaked to be limited to the sparse checkout
paths.

* mt/grep-sparse-checkout:
  config: add setting to ignore sparsity patterns in some cmds
  grep: honor sparse checkout patterns
  config: correctly read worktree configs in submodules
  t/helper/test-config: return exit codes consistently
  doc: grep: unify info on configuration variables

194f14d... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'bc/sha-256-part-2' into pu

SHA-256 migration work continues.

* bc/sha-256-part-2: (44 commits)
  remote-testgit: adapt for object-format
  bundle: detect hash algorithm when reading refs
  t5300: pass --object-format to git index-pack
  t5704: send object-format capability with SHA-256
  t5703: use object-format serve option
  t5702: offer an object-format capability in the test
  t/helper: initialize the repository for test-sha1-array
  remote-curl: avoid truncating refs with ls-remote
  t1050: pass algorithm to index-pack when outside repo
  builtin/index-pack: add option to specify hash algorithm
  remote-curl: detect algorithm for dumb HTTP by size
  builtin/ls-remote: initialize repository based on fetch
  t5500: make hash independent
  serve: advertise object-format capability for protocol v2
  connect: parse v2 refs with correct hash algorithm
  connect: pass full packet reader when parsing v2 refs
  Documentation/technical: document object-format for protocol v2
  t1302: expect repo format version 1 for SHA-256
  builtin/show-index: provide options to determine hash algo
  t5302: modernize test formatting
  ...

2a627cc... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'jk/complete-git-switch' into pu

The command line completion (in contrib/) learned to complete
options that the "git switch" command takes.

* jk/complete-git-switch:
  completion: improve handling of --orphan option of switch/checkout
  completion: improve handling of -c/-C and -b/-B in switch/checkout
  completion: improve handling of --track in switch/checkout
  completion: improve handling of --detach in checkout
  completion: improve completion for git switch with no options
  completion: improve handling of DWIM mode for switch/checkout
  completion: perform DWIM logic directly in __git_complete_refs
  completion: extract function __git_dwim_remote_heads
  completion: replace overloaded track term for __git_complete_refs
  completion: add tests showing subpar switch/checkout --orphan logic
  completion: add tests showing subpar -c/C argument completion
  completion: add tests showing subpar -c/-C startpoint completion
  completion: add tests showing subpar switch/checkout --track logic
  completion: add tests showing subar checkout --detach logic
  completion: add tests showing subpar DWIM logic for switch/checkout
  completion: add test showing subpar git switch completion

25601f9... by Junio C Hamano <email address hidden> on 2020-06-01

Merge branch 'dr/push-remoteref-fix' into pu

The "%(push:remoteref)" placeholder in the "--format=" argument of
"git format-patch" (and friends) only showed what got explicitly
configured, not what ref at the receiving end would be updated when
"git push" was used, as it ignored the default behaviour (e.g. update
the same ref as the source).

* dr/push-remoteref-fix:
  remote.c: fix handling of %(push:remoteref)