To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (May 2020, #06; Tue, 19)
-X-master-at: efcab5b7a3d2ce2ae4bf808b335938098b18d960
-X-next-at: ede8c892b8d8194a9b64c2cfd62396141e5199d2
+Subject: What's cooking in git.git (May 2020, #07; Wed, 20)
+X-master-at: 87680d32efb6d14f162e54ad3bda4e3d6c908559
+X-next-at: 8d5cacc8d1ede34c079dff20da097c4e1f481d2c
-What's cooking in git.git (May 2020, #06; Tue, 19)
+What's cooking in git.git (May 2020, #07; Wed, 20)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
-Git 2.27-rc1 tomorrow, with topics scheduled to be in 'master'
-(listed below). I am paying less attention than usual for topics
-that are not in 'next', but it would be good to have well-reviewed
-topics cooking in 'next' when the feature-freeze ends.
+Git 2.27-rc1 has been tagged. There are a handful of topics to
+further fix-up what we have been built during this cycle still not
+in 'next', and they will be merged to 'next' later today and then
+down to 'master' before -rc2.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
-[New Topics]
-
-* ds/trace-log-progress-fix (2020-05-15) 1 commit
- (merged to 'next' on 2020-05-15 at d82c1fd03f)
- + progress: call trace2_region_leave() only after calling _enter()
-
- Last-minute fix for our recent change to allow use of progress API
- as a traceable region.
-
- Will merge to 'master'.
-
-
-* en/sparse-checkout (2020-05-15) 1 commit
- (merged to 'next' on 2020-05-15 at d4b3058787)
- + unpack-trees: also allow get_progress() to work on a different index
-
- Consistency fix to a topic already in 'master'.
-
- Will merge to 'master'.
-
-
-* jc/fix-tap-output-under-bash (2020-05-15) 3 commits
- (merged to 'next' on 2020-05-15 at de8f92d652)
- + Revert "tests: when run in Bash, annotate test failures with file name/line number"
- + Revert "ci: add a problem matcher for GitHub Actions"
- + Revert "t/test_lib: avoid naked bash arrays in file_lineno"
-
- A recent attempt to make the test output nicer to view on CI
- systems broke TAP output under bash. The effort has been reverted
- to be re-attempted in the next cycle.
-
- Will merge to 'master'.
-
+[Graduated to "master"]
* ak/slab-decl-cleanup (2020-05-18) 1 commit
(merged to 'next' on 2020-05-19 at 7de41005de)
Code clean-up.
- Will merge to 'master'.
+* cb/no-more-gmtime (2020-05-14) 1 commit
+ (merged to 'next' on 2020-05-15 at 160e0ada09)
+ + compat: remove gmtime
-* an/merge-single-strategy-optim (2020-05-19) 1 commit
- - merge: optimization to skip evaluate_result for single strategy
+ Code clean-up by removing a compatibility implementation of a
+ function we no longer use.
- Code optimization for a common case.
- Will merge to 'next'.
+* dd/t1509-i18n-fix (2020-05-13) 1 commit
+ (merged to 'next' on 2020-05-15 at a6342455c1)
+ + t1509: correct i18n test
+ A few tests were not i18n clean.
-* cc/upload-pack-data (2020-05-18) 13 commits
- - upload-pack: use upload_pack_data fields in receive_needs()
- - upload-pack: pass upload_pack_data to create_pack_file()
- - upload-pack: remove static variable 'stateless_rpc'
- - upload-pack: pass upload_pack_data to check_non_tip()
- - upload-pack: pass upload_pack_data to send_ref()
- - upload-pack: move symref to upload_pack_data
- - upload-pack: use upload_pack_data writer in receive_needs()
- - upload-pack: pass upload_pack_data to receive_needs()
- - upload-pack: pass upload_pack_data to get_common_commits()
- - upload-pack: use 'struct upload_pack_data' in upload_pack()
- - upload-pack: move 'struct upload_pack_data' around
- - upload-pack: move {want,have}_obj to upload_pack_data
- - upload-pack: remove unused 'wants' from upload_pack_data
- Code clean-up.
+* ds/trace-log-progress-fix (2020-05-15) 1 commit
+ (merged to 'next' on 2020-05-15 at d82c1fd03f)
+ + progress: call trace2_region_leave() only after calling _enter()
+ Last-minute fix for our recent change to allow use of progress API
+ as a traceable region.
-* dl/remote-curl-deadlock-fix (2020-05-19) 7 commits
- - stateless-connect: send response end packet
- - pkt-line: define PACKET_READ_RESPONSE_END
- - remote-curl: error on incomplete packet
- - pkt-line: extern packet_length()
- - transport: extract common fetch_pack() call
- - remote-curl: remove label indentation
- - remote-curl: fix typo
- On-the-wire protocol v2 easily falls into a deadlock between the
- remote-curl helper and the fetch-pack process when the server side
- prematurely throws an error and disconnects. The communication has
- been updated to make it more robust.
+* en/merge-rename-rename-worktree-fix (2020-05-14) 1 commit
+ (merged to 'next' on 2020-05-15 at 7e1ddfa3c9)
+ + merge-recursive: fix rename/rename(1to2) for working tree with a binary
- Will merge to 'next'.
+ When a binary file gets modified and renamed on both sides of history
+ to different locations, both files would be written to the working
+ tree but both would have the contents from "ours". This has been
+ corrected so that the path from each side gets their original content.
+
+
+* en/sparse-checkout (2020-05-15) 1 commit
+ (merged to 'next' on 2020-05-15 at d4b3058787)
+ + unpack-trees: also allow get_progress() to work on a different index
+
+ Consistency fix to a topic already in 'master'.
* es/bugreport (2020-05-18) 1 commit
Doc fix.
- Will merge to 'master'.
-
-
-* gp/hppa-stack-test-fix (2020-05-18) 1 commit
- - tests: skip small-stack tests on hppa architecture
-
- Platform dependent tweak to a test for HP-PA.
-
- Will merge to 'next'.
-
-* jk/ci-only-on-selected-branches (2020-05-18) 1 commit
- - ci/config: correct instruction for CI preferences
-
- Dev support.
+* jc/fix-tap-output-under-bash (2020-05-15) 3 commits
+ (merged to 'next' on 2020-05-15 at de8f92d652)
+ + Revert "tests: when run in Bash, annotate test failures with file name/line number"
+ + Revert "ci: add a problem matcher for GitHub Actions"
+ + Revert "t/test_lib: avoid naked bash arrays in file_lineno"
- Will merge to 'next'.
+ A recent attempt to make the test output nicer to view on CI
+ systems broke TAP output under bash. The effort has been reverted
+ to be re-attempted in the next cycle.
-* la/diff-relative-config (2020-05-19) 1 commit
- - diff: add config option relative
+* js/ci-sdk-download-fix (2020-05-15) 1 commit
+ (merged to 'next' on 2020-05-15 at 9b28f7ec87)
+ + ci: avoid pounding on the poor ci-artifacts container
- The commands in the "diff" family learned to honor "diff.relative"
- configuration variable.
+ Instead of downloading Windows SDK for CI jobs for windows builds
+ from an external site (wingit.blob.core.windows.net), use the one
+ created in the windows-build job, to work around quota issues at
+ the external site.
- Almost there.
- cf. <20200519230124.GA12509@danh.dev>
+--------------------------------------------------
+[New Topics]
+* bc/faq (2020-05-20) 1 commit
+ - command-list.txt: add gitfaq to the list of guides
-* ma/doc-fixes (2020-05-18) 5 commits
- - git-sparse-checkout.txt: add missing '
- - git-credential.txt: use list continuation
- - git-commit-graph.txt: fix list rendering
- - git-commit-graph.txt: fix grammo
- - date-formats.txt: fix list continuation
+ "git help guides" now includes the newly added FAQ document.
- Various doc fixes.
+ Will merge to 'next' and then to 'master'.
- Will merge to 'next'.
+* cb/bisect-replay-with-dos-fix (2020-05-20) 1 commit
+ - bisect: avoid tailing CR characters from revision in replay
-* dd/t5703-grep-a-fix (2020-05-19) 1 commit
- - t5703: replace "grep -a" usage by perl
+ Re-fix longstanding "edited bisect log may confuse bisect replay
+ with trailing carriage-return" issue.
- Update an unconditional use of "grep -a" with a perl script in a test.
+ Will merge to 'next' and then to 'master'.
- Will merge to 'next'.
+* dl/merge-autostash (2020-05-20) 1 commit
+ - t5520: avoid alternation in grep's BRE (not POSIX)
-* ds/multi-pack-verify (2020-05-19) 1 commit
- - fsck: use ERROR_MULTI_PACK_INDEX
+ Test fix.
- Fix for a copy-and-paste error introduced during 2.20 era.
-
- Will merge to 'next'.
+ Will merge to 'next' and then to 'master'.
-* jt/avoid-prefetch-when-able-in-diff (2020-05-19) 1 commit
- - t4067: make rename detection test output raw diff
+* gs/commit-graph-path-filter (2020-05-20) 1 commit
+ - t4216: avoid unnecessary subshell in test_bloom_filters_not_used
- Test-coverage enhancement.
+ Test fix.
Will merge to 'next' and then to 'master'.
"git rebase -i" learns a bit more options.
- Needs review.
+ Expecting a reroll.
+ cf. <c3dad0e2-e381-499a-af02-ef3f49207c49@gmail.com>
* jk/complete-git-switch (2020-04-28) 11 commits
--------------------------------------------------
[Cooking]
-* cb/no-more-gmtime (2020-05-14) 1 commit
- (merged to 'next' on 2020-05-15 at 160e0ada09)
- + compat: remove gmtime
+* an/merge-single-strategy-optim (2020-05-19) 1 commit
+ (merged to 'next' on 2020-05-20 at 8d5cacc8d1)
+ + merge: optimization to skip evaluate_result for single strategy
- Code clean-up by removing a compatibility implementation of a
- function we no longer use.
+ Code optimization for a common case.
+
+ Will cook in 'next'.
+
+
+* cc/upload-pack-data (2020-05-18) 13 commits
+ - upload-pack: use upload_pack_data fields in receive_needs()
+ - upload-pack: pass upload_pack_data to create_pack_file()
+ - upload-pack: remove static variable 'stateless_rpc'
+ - upload-pack: pass upload_pack_data to check_non_tip()
+ - upload-pack: pass upload_pack_data to send_ref()
+ - upload-pack: move symref to upload_pack_data
+ - upload-pack: use upload_pack_data writer in receive_needs()
+ - upload-pack: pass upload_pack_data to receive_needs()
+ - upload-pack: pass upload_pack_data to get_common_commits()
+ - upload-pack: use 'struct upload_pack_data' in upload_pack()
+ - upload-pack: move 'struct upload_pack_data' around
+ - upload-pack: move {want,have}_obj to upload_pack_data
+ - upload-pack: remove unused 'wants' from upload_pack_data
+
+ Code clean-up.
+
+
+* dl/remote-curl-deadlock-fix (2020-05-19) 7 commits
+ - stateless-connect: send response end packet
+ - pkt-line: define PACKET_READ_RESPONSE_END
+ - remote-curl: error on incomplete packet
+ - pkt-line: extern packet_length()
+ - transport: extract common fetch_pack() call
+ - remote-curl: remove label indentation
+ - remote-curl: fix typo
+
+ On-the-wire protocol v2 easily falls into a deadlock between the
+ remote-curl helper and the fetch-pack process when the server side
+ prematurely throws an error and disconnects. The communication has
+ been updated to make it more robust.
+
+ Will merge to 'next'.
+
+
+* gp/hppa-stack-test-fix (2020-05-18) 1 commit
+ (merged to 'next' on 2020-05-20 at 57ed63b4ad)
+ + tests: skip small-stack tests on hppa architecture
+
+ Platform dependent tweak to a test for HP-PA.
Will merge to 'master'.
+* jk/ci-only-on-selected-branches (2020-05-18) 1 commit
+ - ci/config: correct instruction for CI preferences
+
+ Dev support.
+
+ Will merge to 'next'.
+
+
+* la/diff-relative-config (2020-05-19) 1 commit
+ - diff: add config option relative
+
+ The commands in the "diff" family learned to honor "diff.relative"
+ configuration variable.
+
+ Almost there.
+ cf. <20200519230124.GA12509@danh.dev>
+
+
+* ma/doc-fixes (2020-05-18) 5 commits
+ - git-sparse-checkout.txt: add missing '
+ - git-credential.txt: use list continuation
+ - git-commit-graph.txt: fix list rendering
+ - git-commit-graph.txt: fix grammo
+ - date-formats.txt: fix list continuation
+
+ Various doc fixes.
+
+ Will merge to 'next' and then to 'master'.
+
+
+* dd/t5703-grep-a-fix (2020-05-19) 1 commit
+ - t5703: replace "grep -a" usage by perl
+
+ Update an unconditional use of "grep -a" with a perl script in a test.
+
+ Will merge to 'next' and then to 'master'.
+
+
+* ds/multi-pack-verify (2020-05-19) 1 commit
+ - fsck: use ERROR_MULTI_PACK_INDEX
+
+ Fix for a copy-and-paste error introduced during 2.20 era.
+
+ Will merge to 'next' and then to 'master'.
+
+
+* jt/avoid-prefetch-when-able-in-diff (2020-05-19) 1 commit
+ - t4067: make rename detection test output raw diff
+
+ Test-coverage enhancement.
+
+ Will merge to 'next' and then to 'master'.
+
+
* cb/t4210-illseq-auto-detect (2020-05-18) 2 commits
- t4210: detect REG_ILLSEQ dynamically and skip affected tests
- t/helper: teach test-regex to report pattern errors (like REG_ILLSEQ)
Will merge to 'next'.
-* en/merge-rename-rename-worktree-fix (2020-05-14) 1 commit
- (merged to 'next' on 2020-05-15 at 7e1ddfa3c9)
- + merge-recursive: fix rename/rename(1to2) for working tree with a binary
-
- When a binary file gets modified and renamed on both sides of history
- to different locations, both files would be written to the working
- tree but both would have the contents from "ours". This has been
- corrected so that the path from each side gets their original content.
-
- Will merge to 'master'.
-
-
* bk/p4-prepare-p4-only-fix (2020-05-12) 1 commit
- git-p4.py: fix --prepare-p4-only error with multiple commits
Expecting a reroll.
-* js/ci-sdk-download-fix (2020-05-15) 1 commit
- (merged to 'next' on 2020-05-15 at 9b28f7ec87)
- + ci: avoid pounding on the poor ci-artifacts container
-
- Instead of downloading Windows SDK for CI jobs for windows builds
- from an external site (wingit.blob.core.windows.net), use the one
- created in the windows-build job, to work around quota issues at
- the external site.
-
- Will merge to 'master'.
-
-
* bc/sha-256-part-2 (2020-05-13) 44 commits
- remote-testgit: adapt for object-format
- bundle: detect hash algorithm when reading refs
SHA-256 migration work continues.
-* dd/t1509-i18n-fix (2020-05-13) 1 commit
- (merged to 'next' on 2020-05-15 at a6342455c1)
- + t1509: correct i18n test
-
- A few tests were not i18n clean.
-
- Will merge to 'master'.
-
-
* es/bugreport-shell (2020-05-12) 2 commits
- bugreport: include user interactive shell
- help: add shell-path to --build-options
Needs review.
-* hn/refs-cleanup (2020-05-11) 6 commits
+* hn/refs-cleanup (2020-05-20) 6 commits
- reftable: define version 2 of the spec to accomodate SHA256
- reftable: clarify how empty tables should be written
- reftable: file format documentation
- - refs: document how ref_iterator_advance_fn should handle symrefs
+ - refs: improve documentation for ref iterator
- t: use update-ref and show-ref to reading/writing refs
- refs.h: clarify reflog iteration order
(this branch is used by hn/reftable.)
Preliminary clean-ups around refs API, plus file format
specification documentation for the reftable backend.
- Almost there.
+ Will merge to 'next'.
-* hn/reftable (2020-05-18) 9 commits
+* hn/reftable (2020-05-20) 9 commits
- Add reftable testing infrastructure
- vcxproj: adjust for the reftable changes
- Add GIT_DEBUG_REFS debugging mechanism
projects / thirdparty / git.git / commitdiff
