summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-25 22:01:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-25 22:01:04 (GMT)
commita1559cac8e400e7493b2337cbbefe9e634e50f53 (patch)
treea7b9b0c1d5707d21d2b5a07c4b94caa52555130c
parent43d20d31b61e9a3c74343fef0664db7b260bc470 (diff)
downloadgit-a1559cac8e400e7493b2337cbbefe9e634e50f53.zip
git-a1559cac8e400e7493b2337cbbefe9e634e50f53.tar.gz
git-a1559cac8e400e7493b2337cbbefe9e634e50f53.tar.bz2
What's cooking (2020/03 #08)
-rw-r--r--whats-cooking.txt481
1 files changed, 267 insertions, 214 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt
index f0decad..612d6b6 100644
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,10 +1,10 @@
To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Mar 2020, #07; Sun, 22)
-X-master-at: 274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925
-X-next-at: b8618d28a927273cc429ccf5d4d91508d4fb0799
+Subject: What's cooking in git.git (Mar 2020, #08; Wed, 25)
+X-master-at: a7d14a44285d3ec4b25bf9e3b7df701221350661
+X-next-at: 33ef6b2f381b0c2d6c1eba5609779d5de2162ad9
-What's cooking in git.git (Mar 2020, #07; Sun, 22)
+What's cooking in git.git (Mar 2020, #08; Wed, 25)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
@@ -12,7 +12,8 @@ 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.26 (final) has been tagged.
+The first batch of topics after v2.26 are now in 'master'. I plan
+to rewind and rebuild 'next' after merging another batch.
You can find the changes described here in the integration branches
of the repositories listed at
@@ -22,67 +23,126 @@ of the repositories listed at
--------------------------------------------------
[Graduated to "master"]
-* en/rebase-backend (2020-03-20) 1 commit
- (merged to 'next' on 2020-03-21 at abd2f92971)
- + t3419: prevent failure when run with EXPENSIVE
+* am/real-path-fix (2020-03-10) 4 commits
+ (merged to 'next' on 2020-03-11 at 1f843820a7)
+ + get_superproject_working_tree(): return strbuf
+ + real_path_if_valid(): remove unsafe API
+ + real_path: remove unsafe API
+ + set_git_dir: fix crash when used with real_path()
- Test fix.
+ The real_path() convenience function can easily be misused; with a
+ bit of code refactoring in the callers' side, its use has been
+ eliminated.
---------------------------------------------------
-[New Topics]
-* ds/default-pack-use-sparse-to-true (2020-03-20) 2 commits
- (merged to 'next' on 2020-03-21 at 25cc87784d)
- + pack-objects: flip the use of GIT_TEST_PACK_SPARSE
- + config: set pack.useSparse=true by default
+* ds/check-connected-reprepare-packed-git (2020-03-15) 1 commit
+ (merged to 'next' on 2020-03-16 at 609a322030)
+ + connected.c: reprepare packs for corner cases
- The 'pack.useSparse' configuration variable now defaults to 'true',
- enabling an optimization that has been experimental since Git 2.21.
+ Corner case "git fetch" fix.
- Will cook in 'next'.
+* en/oidset-uninclude-hashmap (2020-03-15) 1 commit
+ (merged to 'next' on 2020-03-16 at a79879866d)
+ + oidset: remove unnecessary include
-* js/trace2-env-vars (2020-03-20) 1 commit
- - trace2: teach Git to log environment variables
+ Code clean-up.
- Trace2 enhancement to allow logging of the environment variables.
+* hw/advise-ng (2020-03-05) 4 commits
+ (merged to 'next' on 2020-03-09 at ea9e5a1fa3)
+ + tag: use new advice API to check visibility
+ + advice: revamp advise API
+ + advice: change "setupStreamFailure" to "setUpstreamFailure"
+ + advice: extract vadvise() from advise()
-* ar/test-style-fixes (2020-03-22) 2 commits
- - t: fix whitespace around &&
- - t9500: remove spaces after redirect operators
+ Revamping of the advise API to allow more systematic enumeration of
+ advice knobs in the future.
- Style fixes.
- Will merge to 'next'.
+* jc/config-tar (2020-03-18) 1 commit
+ (merged to 'next' on 2020-03-19 at aa6216fd1a)
+ + separate tar.* config to its own source file
+ Improve the structure of the documentation source a bit.
-* ds/doc-clone-filter (2020-03-22) 1 commit
- - clone: document --filter options
+
+* jc/maintain-doc (2020-03-09) 1 commit
+ (merged to 'next' on 2020-03-09 at 7f1a754f60)
+ + update how-to-maintain-git
Doc update.
- Will merge to 'next'.
+* js/https-proxy-config (2020-03-05) 2 commits
+ (merged to 'next' on 2020-03-09 at 8a06f8501d)
+ + http: add environment variable support for HTTPS proxies
+ + http: add client cert support for HTTPS proxies
-* jk/t3419-drop-expensive-tests (2020-03-22) 1 commit
- - t3419: drop EXPENSIVE tests
+ A handful of options to configure SSL when talking to proxies have
+ been added.
- Test update.
- Will merge to 'next'.
+* pw/advise-rebase-skip (2019-12-06) 7 commits
+ (merged to 'next' on 2020-03-11 at 80386de756)
+ + 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
+ 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.
+ cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
-* jt/connectivity-check-optim-in-partial-clone (2020-03-22) 1 commit
- - connected: always use partial clone optimization
- Simplify the commit ancestry connectedness check in a partial clone
- repository in which "promised" objects are assumed to be obtainable
- lazily on-demand from promisor remote repositories.
+* rs/doc-passthru-fetch-options (2020-03-11) 1 commit
+ (merged to 'next' on 2020-03-12 at f08dab7228)
+ + pull: document more passthru options
+
+ Doc update.
+* sg/commit-slab-clarify-peek (2020-03-10) 1 commit
+ (merged to 'next' on 2020-03-11 at 0496b26f23)
+ + commit-slab: clarify slabname##_peek()'s return value
-* mt/test-lib-bundled-short-options (2020-03-22) 9 commits
+ In-code comment update.
+
+
+* ss/submodule-foreach-cb (2020-03-18) 1 commit
+ (merged to 'next' on 2020-03-21 at 6651eafe02)
+ + submodule--helper.c: Rename 'cb_foreach' to 'foreach_cb'
+
+ Code clean-up.
+
+
+* yz/p4-py3 (2020-03-10) 14 commits
+ (merged to 'next' on 2020-03-11 at 01ca57c2b2)
+ + ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
+ + git-p4: use python3's input() everywhere
+ + git-p4: simplify regex pattern generation for parsing diff-tree
+ + git-p4: use dict.items() iteration for python3 compatibility
+ + git-p4: use functools.reduce instead of reduce
+ + git-p4: fix freezing while waiting for fast-import progress
+ + git-p4: use marshal format version 2 when sending to p4
+ + git-p4: open .gitp4-usercache.txt in text mode
+ + git-p4: convert path to unicode before processing them
+ + git-p4: encode/decode communication with git for python3
+ + git-p4: encode/decode communication with p4 for python3
+ + git-p4: remove string type aliasing
+ + git-p4: change the expansion test from basestring to list
+ + git-p4: make python2.7 the oldest supported version
+
+ Update "git p4" to work with Python 3.
+
+--------------------------------------------------
+[New Topics]
+
+* dd/test-with-busybox (2020-03-25) 8 commits
- t5703: feed raw data into test-tool unpack-sideband
- t4124: fix test for non-compliant diff(1)
- t7063: drop non-POSIX argument "-ls" from find(1)
@@ -91,9 +151,87 @@ of the repositories listed at
- t5003: drop the subshell in test_lazy_prereq
- test-lib-functions: test_cmp: eval $GIT_TEST_CMP
- t4061: use POSIX compliant regex(7)
- - test-lib: allow short options to be bundled
- Minor test usability improvement.
+ Various tests have been updated to work around issues found with
+ shell utilities that come with busybox etc.
+
+ Will merge to 'next'.
+
+
+* dl/libify-a-few (2020-03-24) 2 commits
+ - Lib-ify prune-packed
+ - Lib-ify fmt-merge-msg
+
+ Code in builtin/*, i.e. those can only be called from within
+ built-in subcommands, that implements bulk of a couple of
+ subcommands have been moved to libgit.a so that they could be used
+ by others.
+
+
+* dl/test-must-fail-fixes-3 (2020-03-24) 8 commits
+ - t5801: teach compare_refs() to accept !
+ - t5612: stop losing return codes of git commands
+ - t5612: don't use `test_must_fail test_cmp`
+ - t5607: reorder `nongit test_must_fail`
+ - t5550: remove use of `test_might_fail grep`
+ - t5512: stop losing return codes of git commands
+ - t5512: generate references with generate_references()
+ - t5512: don't use `test_must_fail test_cmp`
+
+ Test clean-up continues.
+
+
+* en/sparse-checkout (2020-03-23) 18 commits
+ - sparse-checkout: provide a new reapply subcommand
+ - unpack-trees: failure to set SKIP_WORKTREE bits always just a warning
+ - unpack-trees: provide warnings on sparse updates for unmerged paths too
+ - unpack-trees: make sparse path messages sound like warnings
+ - unpack-trees: split display_error_msgs() into two
+ - unpack-trees: rename ERROR_* fields meant for warnings to WARNING_*
+ - unpack-trees: move ERROR_WOULD_LOSE_SUBMODULE earlier
+ - sparse-checkout: use improved unpack_trees porcelain messages
+ - sparse-checkout: use new update_sparsity() function
+ - unpack-trees: add a new update_sparsity() function
+ - unpack-trees: pull sparse-checkout pattern reading into a new function
+ - unpack-trees: do not mark a dirty path with SKIP_WORKTREE
+ - unpack-trees: allow check_updates() to work on a different index
+ - t1091: make some tests a little more defensive against failures
+ - unpack-trees: simplify pattern_list freeing
+ - unpack-trees: simplify verify_absent_sparse()
+ - unpack-trees: remove unused error type
+ - unpack-trees: fix minor typo in comment
+
+ "sparse-checkout" UI improvements.
+
+
+* js/import-tars-do-not-make-phony-files-from-pax-headers (2020-03-24) 1 commit
+ - import-tars: ignore the global PAX header
+
+ The import-tars importer (in contrib/fast-import/) used to create
+ phony files at the top-level of the repository when the archive
+ contains global PAX headers, which made its own logic to detect and
+ omit the common leading directory ineffective, which has been
+ corrected.
+
+ Will merge to 'next'.
+
+
+* js/test-junit-finalization-fix (2020-03-23) 1 commit
+ - tests(junit-xml): avoid invalid XML
+
+ Test fix.
+
+ Will merge to 'next'.
+
+
+* js/tests-gpg-integration-on-windows (2020-03-25) 5 commits
+ - tests: increase the verbosity of the GPG-related prereqs
+ - tests: do not let lazy prereqs inside `test_expect_*` turn off tracing
+ - tests: turn GPG, GPGSM and RFC1991 into lazy prereqs
+ - t/lib-gpg.sh: stop pretending to be a stand-alone script
+ - tests(gpg): allow the gpg-agent to start on Windows
+
+ Enable tests that require GnuPG on Windows.
Will merge to 'next'.
@@ -122,31 +260,6 @@ of the repositories listed at
Breakage due to byte-order dependency reported.
-* dl/merge-autostash (2020-01-13) 17 commits
- - pull: pass --autostash to merge
- - t5520: make test_pull_autostash() accept expect_parent_num
- - merge: teach --autostash option
- - sequencer: unlink autostash in apply_autostash()
- - sequencer: extract perform_autostash() from rebase
- - rebase: generify create_autostash()
- - rebase: extract create_autostash()
- - reset: extract reset_head() from rebase
- - rebase: generify reset_head()
- - rebase: use apply_autostash() from sequencer.c
- - sequencer: make apply_rebase() accept a path
- - rebase: use read_oneliner()
- - sequencer: make read_oneliner() extern
- - sequencer: configurably warn on non-existent files
- - sequencer: use file strbuf for read_oneliner()
- - t7600: use test_write_lines()
- - Makefile: alphabetically sort += lists
-
- "git merge" learns the "--autostash" option.
-
- Expecting a reroll.
- cf. <20200123042906.GA29009@generichostname>
-
-
* en/fill-directory-exponential (2020-01-31) 6 commits
- t7063: blindly accept diffs
- dir: replace exponential algorithm with a linear one
@@ -185,6 +298,88 @@ of the repositories listed at
--------------------------------------------------
[Cooking]
+* dl/merge-autostash (2020-03-24) 19 commits
+ - pull: pass --autostash to merge
+ - t5520: make test_pull_autostash() accept expect_parent_num
+ - merge: teach --autostash option
+ - sequencer: implement save_autostash()
+ - sequencer: unlink autostash in apply_autostash()
+ - sequencer: extract perform_autostash() from rebase
+ - rebase: generify create_autostash()
+ - rebase: extract create_autostash()
+ - reset: extract reset_head() from rebase
+ - rebase: generify reset_head()
+ - rebase: use apply_autostash() from sequencer.c
+ - sequencer: make apply_rebase() accept a path
+ - rebase: use read_oneliner()
+ - sequencer: make read_oneliner() extern
+ - sequencer: configurably warn on non-existent files
+ - sequencer: make read_oneliner() accept flags
+ - sequencer: use file strbuf for read_oneliner()
+ - t7600: use test_write_lines()
+ - Makefile: ASCII-sort += lists
+
+ "git merge" learns the "--autostash" option.
+
+
+* ds/default-pack-use-sparse-to-true (2020-03-20) 2 commits
+ (merged to 'next' on 2020-03-21 at 25cc87784d)
+ + pack-objects: flip the use of GIT_TEST_PACK_SPARSE
+ + config: set pack.useSparse=true by default
+
+ The 'pack.useSparse' configuration variable now defaults to 'true',
+ enabling an optimization that has been experimental since Git 2.21.
+
+ Will cook in 'next'.
+
+
+* js/trace2-env-vars (2020-03-23) 1 commit
+ - trace2: teach Git to log environment variables
+
+ Trace2 enhancement to allow logging of the environment variables.
+
+
+* ar/test-style-fixes (2020-03-22) 2 commits
+ - t: fix whitespace around &&
+ - t9500: remove spaces after redirect operators
+
+ Style fixes.
+
+ Will merge to 'next'.
+
+
+* ds/doc-clone-filter (2020-03-22) 1 commit
+ - clone: document --filter options
+
+ Doc update.
+
+ Will merge to 'next'.
+
+
+* jk/t3419-drop-expensive-tests (2020-03-22) 1 commit
+ - t3419: drop EXPENSIVE tests
+
+ Test update.
+
+ Will merge to 'next'.
+
+
+* jt/connectivity-check-optim-in-partial-clone (2020-03-22) 1 commit
+ - connected: always use partial clone optimization
+
+ Simplify the commit ancestry connectedness check in a partial clone
+ repository in which "promised" objects are assumed to be obtainable
+ lazily on-demand from promisor remote repositories.
+
+
+* mt/test-lib-bundled-short-options (2020-03-25) 1 commit
+ - test-lib: allow short options to be bundled
+
+ Minor test usability improvement.
+
+ Will merge to 'next'.
+
+
* bk/p4-pre-edit-changelist (2020-02-14) 7 commits
- git-p4: add RCS keyword status message
- git-p4: add p4 submit hooks
@@ -202,15 +397,6 @@ of the repositories listed at
cf. <pull.698.v6.git.git.1581691486.gitgitgadget@gmail.com>
-* jc/config-tar (2020-03-18) 1 commit
- (merged to 'next' on 2020-03-19 at aa6216fd1a)
- + separate tar.* config to its own source file
-
- Improve the structure of the documentation source a bit.
-
- Will merge to 'master'.
-
-
* jt/rebase-allow-duplicate (2020-03-18) 1 commit
- rebase --merge: optionally skip upstreamed commits
@@ -221,33 +407,6 @@ of the repositories listed at
cf. <20200318192821.43808-1-jonathantanmy@google.com>
-* ss/submodule-foreach-cb (2020-03-18) 1 commit
- (merged to 'next' on 2020-03-21 at 6651eafe02)
- + submodule--helper.c: Rename 'cb_foreach' to 'foreach_cb'
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
-* sg/commit-slab-clarify-peek (2020-03-10) 1 commit
- (merged to 'next' on 2020-03-11 at 0496b26f23)
- + commit-slab: clarify slabname##_peek()'s return value
-
- In-code comment update.
-
- Will merge to 'master'.
-
-
-* rs/doc-passthru-fetch-options (2020-03-11) 1 commit
- (merged to 'next' on 2020-03-12 at f08dab7228)
- + pull: document more passthru options
-
- Doc update.
-
- Will merge to 'master'.
-
-
* bc/filter-process (2020-03-16) 8 commits
(merged to 'next' on 2020-03-17 at 2cd9dbf794)
+ t0021: test filter metadata for additional cases
@@ -266,30 +425,12 @@ of the repositories listed at
Will merge to 'master'.
-* bc/faq (2020-03-15) 1 commit
+* bc/faq (2020-03-24) 1 commit
- docs: add a FAQ
Doc update.
-* ds/check-connected-reprepare-packed-git (2020-03-15) 1 commit
- (merged to 'next' on 2020-03-16 at 609a322030)
- + connected.c: reprepare packs for corner cases
-
- Corner case "git fetch" fix.
-
- Will merge to 'master'.
-
-
-* en/oidset-uninclude-hashmap (2020-03-15) 1 commit
- (merged to 'next' on 2020-03-16 at a79879866d)
- + oidset: remove unnecessary include
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
* jc/log-no-mailmap (2020-03-16) 3 commits
- log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap
- clone: reorder --recursive/--recurse-submodules
@@ -298,28 +439,6 @@ of the repositories listed at
"git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"
-* yz/p4-py3 (2020-03-10) 14 commits
- (merged to 'next' on 2020-03-11 at 01ca57c2b2)
- + ci: use python3 in linux-gcc and osx-gcc and python2 elsewhere
- + git-p4: use python3's input() everywhere
- + git-p4: simplify regex pattern generation for parsing diff-tree
- + git-p4: use dict.items() iteration for python3 compatibility
- + git-p4: use functools.reduce instead of reduce
- + git-p4: fix freezing while waiting for fast-import progress
- + git-p4: use marshal format version 2 when sending to p4
- + git-p4: open .gitp4-usercache.txt in text mode
- + git-p4: convert path to unicode before processing them
- + git-p4: encode/decode communication with git for python3
- + git-p4: encode/decode communication with p4 for python3
- + git-p4: remove string type aliasing
- + git-p4: change the expansion test from basestring to list
- + git-p4: make python2.7 the oldest supported version
-
- Update "git p4" to work with Python 3.
-
- Will merge to 'master'.
-
-
* hi/gpg-prefer-check-signature (2020-03-15) 2 commits
(merged to 'next' on 2020-03-17 at 2def2d9a7e)
+ gpg-interface: prefer check_signature() for GPG verification
@@ -330,32 +449,8 @@ of the repositories listed at
Will merge to 'master'.
-* jc/maintain-doc (2020-03-09) 1 commit
- (merged to 'next' on 2020-03-09 at 7f1a754f60)
- + update how-to-maintain-git
-
- Doc update.
-
- Will merge to 'master'.
-
-
-* am/real-path-fix (2020-03-10) 4 commits
- (merged to 'next' on 2020-03-11 at 1f843820a7)
- + get_superproject_working_tree(): return strbuf
- + real_path_if_valid(): remove unsafe API
- + real_path: remove unsafe API
- + set_git_dir: fix crash when used with real_path()
-
- The real_path() convenience function can easily be misused; with a
- bit of code refactoring in the callers' side, its use has been
- eliminated.
-
- Will merge to 'master'.
-
-
-* tb/commit-graph-split-merge (2020-03-05) 3 commits
- (merged to 'next' on 2020-03-09 at f3aa7bb305)
- + builtin/commit-graph.c: support '--input=none'
+* tb/commit-graph-split-merge (2020-03-24) 3 commits
+ - builtin/commit-graph.c: support '--input=graphed'
+ builtin/commit-graph.c: introduce '--input=<source>'
+ builtin/commit-graph.c: support '--split[=<strategy>]'
@@ -363,7 +458,7 @@ of the repositories listed at
options to control if the resulting graph chains should be merged
or a single new incremental graph is created.
- Will cook in 'next'.
+ Will merge to 'next'.
* ah/force-pull-rebase-configuration (2020-03-10) 1 commit
@@ -389,35 +484,6 @@ of the repositories listed at
cf. <20200306172913.GF1571684@cat>
-* js/https-proxy-config (2020-03-05) 2 commits
- (merged to 'next' on 2020-03-09 at 8a06f8501d)
- + http: add environment variable support for HTTPS proxies
- + http: add client cert support for HTTPS proxies
-
- A handful of options to configure SSL when talking to proxies have
- been added.
-
- Will merge to 'master'.
-
-
-* pw/advise-rebase-skip (2019-12-06) 7 commits
- (merged to 'next' on 2020-03-11 at 80386de756)
- + 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
-
- 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.
-
- Will merge to 'master'.
- cf. <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com>
-
-
* at/rebase-fork-point-regression-fix (2020-02-11) 1 commit
(merged to 'next' on 2020-03-02 at a1a84d37a7)
+ rebase: --fork-point regression fix
@@ -489,19 +555,6 @@ of the repositories listed at
Will merge to 'master'.
-* hw/advise-ng (2020-03-05) 4 commits
- (merged to 'next' on 2020-03-09 at ea9e5a1fa3)
- + tag: use new advice API to check visibility
- + advice: revamp advise API
- + advice: change "setupStreamFailure" to "setUpstreamFailure"
- + advice: extract vadvise() from advise()
-
- Revamping of the advise API to allow more systematic enumeration of
- advice knobs in the future.
-
- Will merge to 'master'.
-
-
* hn/reftable (2020-02-26) 6 commits
. Reftable support for git-core
. Add reftable library
@@ -519,8 +572,7 @@ of the repositories listed at
SHA-256 topic.
-* es/bugreport (2020-03-06) 6 commits
- - SQUASH???
+* es/bugreport (2020-03-23) 5 commits
- bugreport: add compiler info
- bugreport: add uname info
- bugreport: gather git version and build info
@@ -529,6 +581,7 @@ of the repositories listed at
The "bugreport" tool.
+ New iteration (v11) exists, which needs to be picked up.
As the scope of the topic got trimmed, hopefully these early parts
can be polished quickly enough to be merged down.