To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Nov 2021, #05; Fri, 19)
-X-master-at: cd3e606211bb1cf8bc57f7d76bab98cc17a150bc
-X-next-at: b44f4d0eb0c6319e109b5f54df97d96d0d6b46fd
+Subject: What's cooking in git.git (Nov 2021, #06; Wed, 24)
+X-master-at: 35151cf0720460a897cde9b8039af364743240e7
+X-next-at: a245620fadb0d35540dd0d2184f0f8314eb97080
-What's cooking in git.git (Nov 2021, #05; Fri, 19)
+What's cooking in git.git (Nov 2021, #06; Wed, 24)
--------------------------------------------------
+As 2.34.0 cycle was run rather loosely, we saw our share of
+regressions in the release. Hopefully we have caught the major ones
+and fixed them all in the 2.34.1 maintenance release that was just
+tagged.
+
+I've marked most of the topics that are in 'next' for the 'master'
+branch, except for a few topics, but if there are topics that should
+be rethought instead, please holler. Once flushing these topics
+down to 'master', the tip of 'next' will be rewound and then we'll
+start taking new topics to it.
+
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a
'seen'. The ones marked with '.' do not appear in any of the
integration branches, but I am still holding onto them.
-The tip of the 'master' branch is still at v2.34.0.
-
A few topics for regression fixes have been merged to 'next' and
will be merged to 'master' shortly. There are many topics listed as
"New" that are in 'seen', but I haven't read many of them (and I
https://www.kernel.org/pub/software/scm/git/
+--------------------------------------------------
+[Graduated to 'master']
+
+* ab/update-submitting-patches (2021-11-13) 1 commit
+ (merged to 'next' on 2021-11-19 at b44f4d0eb0)
+ + SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section
+
+ Doc fix.
+
+
+* ds/add-rm-with-sparse-index (2021-11-22) 1 commit
+ - dir: revert "dir: select directories correctly"
+
+ Regression fix for 2.34
+
+
+* ev/pull-already-up-to-date-is-noop (2021-11-18) 1 commit
+ (merged to 'next' on 2021-11-19 at 2d8f0cd000)
+ + pull: should be noop when already-up-to-date
+
+ "git pull" with any strategy when the other side is behind us
+ should succeed as it is a no-op, but doesn't.
+
+
+* hm/paint-hits-in-log-grep (2021-11-19) 1 commit
+ (merged to 'next' on 2021-11-19 at e146d25c7c)
+ + Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"
+
+ "git grep" looking in a blob that has non-UTF8 payload was
+ completely broken when linked with versions of PCREv2 library older
+ than 10.34 in the latest release.
+
+
+* jc/save-restore-terminal-revert (2021-11-22) 1 commit
+ - Revert "editor: save and reset terminal after calling EDITOR"
+
+ Regression fix for 2.34
+
--------------------------------------------------
[New Topics]
+* ab/ci-updates (2021-11-23) 5 commits
+ - CI: don't run "make test" twice in one job
+ - CI: use "$runs_on_pool", not "$jobname" to select packages & config
+ - CI: rename the "Linux32" job to lower-case "linux32"
+ - CI: use shorter names that fit in UX tooltips
+ - CI: remove Travis CI support
+
+
+* en/keep-cwd (2021-11-20) 8 commits
+ - dir: avoid removing the current working directory
+ - stash: do not attempt to remove current working directory
+ - clean: do not attempt to remove current working directory
+ - symlinks: do not include current working directory in dir removal
+ - unpack-trees: add special cwd handling
+ - unpack-trees: refuse to remove the current working directory
+ - repository, setup: introduce the_cwd
+ - t2501: add various tests for removing the current working directory
+
+
+* ab/run-command (2021-11-22) 5 commits
+ - run-command API: remove "argv" member, always use "args"
+ - run-command API users: use strvec_pushl(), not argv construction
+ - run-command API users: use strvec_pushv(), not argv assignment
+ - upload-archive: use regular "struct child_process" pattern
+ - archive-tar: use our own cmd.buf in error message
+
+
+* hn/create-reflog-simplify (2021-11-22) 1 commit
+ - refs: drop force_create argument of create_reflog API
+
+
+* hn/reflog-tests (2021-11-22) 4 commits
+ - t1400: use test-helper ref-store to inspect reflog contents
+ - test-ref-store: tweaks to for-each-reflog-ent format
+ - refs: trim newline from reflog message
+ - show-branch: show reflog message
+
+
+* jt/midx-doc-fix (2021-11-22) 1 commit
+ - Doc: no midx and partial clone relation
+
+
+* tl/ls-tree-oid-only (2021-11-22) 1 commit
+ - ls-tree.c: support `--oid-only` option for "git-ls-tree"
+
+
+* jk/t7006-sigpipe-tests-fix (2021-11-22) 3 commits
+ - t7006: simplify exit-code checks for sigpipe tests
+ - t7006: clean up SIGPIPE handling in trace2 tests
+ - run-command: unify signal and regular logic for wait_or_whine()
+
+ The function to cull a child process and determine the exit status
+ had two separate code paths for normal callers and callers in a
+ signal handler, and the latter did not yield correct value when the
+ child has caught a signal. The handling of the exit status has
+ been unified for these two code paths. An existing test with
+ flakiness has also been corrected.
+
+ Will merge to 'next'.
+
+
+* em/missing-pager (2021-11-24) 1 commit
+ - pager: fix crash when pager program doesn't exist
+
+--------------------------------------------------
+[Stalled]
+
+* ar/submodule-update (2021-10-13) 9 commits
+ . submodule--helper: rename helper functions
+ . submodule--helper: remove unused helpers
+ . submodule: move core cmd_update() logic to C
+ . submodule--helper: run update using child process struct
+ . submodule--helper: allow setting superprefix for init_submodule()
+ . submodule--helper: refactor get_submodule_displaypath()
+ . submodule--helper: rename helpers for update-clone
+ . submodule--helper: get remote names from any repository
+ . submodule--helper: split up ensure_core_worktree()
+
+ Rewrite of "git submodule update" in C.
+
+ Kicked out of 'seen' to make room for es/superproject-aware-submodules
+ which is among the topics this topic stomps on.
+
+
+* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
+ - fetch: fix segfault on --set-upstream while on a detached HEAD
+
+ "git fetch --set-upstream" while on detached HEAD segfaulted
+ instead of noticing that such an operation did not make sense.
+
+ Getting tired of waiting for a reroll; will discard.
+
+--------------------------------------------------
+[Cooking]
+
* ab/checkout-branch-info-leakfix (2021-11-18) 1 commit
- checkout: fix "branch info" memory leaks
(this branch uses ld/sparse-diff-blame and vd/sparse-reset.)
-* ev/pull-already-up-to-date-is-noop (2021-11-18) 1 commit
- (merged to 'next' on 2021-11-19 at 2d8f0cd000)
- + pull: should be noop when already-up-to-date
-
- "git pull" with any strategy when the other side is behind us
- should succeed as it is a no-op, but doesn't.
-
- Will merge to 'master'.
-
-
* fs/ssh-signing-other-keytypes (2021-11-19) 2 commits
- ssh signing: make sign/amend test more resilient
- ssh signing: support non ssh-* keytypes
-* fs/test-prereq (2021-11-18) 2 commits
+* fs/test-prereq (2021-11-20) 3 commits
+ - test-lib: make BAIL_OUT() work in tests and prereq
- test-lib: introduce required prereq for test runs
- test-lib: show missing prereq summary
+ The test framework learns to list unsatisfied test prerequisites,
+ and optionally error out when prerequisites that are expected to be
+ satisfied are not.
+
* jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit
- t5319: corrupt more bytes of the midx checksum
Bitop fix for 32-bit boxes.
-* xw/am-empty (2021-11-19) 3 commits
- - SQUASH???
+* xw/am-empty (2021-11-22) 2 commits
- am: support --empty=<option> to handle empty patches
- doc: git-format-patch: describe the option --always
Comment fix.
-* hm/paint-hits-in-log-grep (2021-11-19) 1 commit
- (merged to 'next' on 2021-11-19 at e146d25c7c)
- + Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"
-
- "git grep" looking in a blob that has non-UTF8 payload was
- completely broken when linked with certain versions of PCREv2
- library in the latest release.
-
- Will merge to 'master'.
-
-
* jk/fetch-pack-avoid-sigpipe-to-index-pack (2021-11-19) 1 commit
- fetch-pack: ignore SIGPIPE when writing to index-pack
Will merge to 'next'.
---------------------------------------------------
-[Stalled]
-
-* ar/submodule-update (2021-10-13) 9 commits
- . submodule--helper: rename helper functions
- . submodule--helper: remove unused helpers
- . submodule: move core cmd_update() logic to C
- . submodule--helper: run update using child process struct
- . submodule--helper: allow setting superprefix for init_submodule()
- . submodule--helper: refactor get_submodule_displaypath()
- . submodule--helper: rename helpers for update-clone
- . submodule--helper: get remote names from any repository
- . submodule--helper: split up ensure_core_worktree()
-
- Rewrite of "git submodule update" in C.
-
- Kicked out of 'seen' to make room for es/superproject-aware-submodules
- which is among the topics this topic stomps on.
-
-
-* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
- - fetch: fix segfault on --set-upstream while on a detached HEAD
-
- "git fetch --set-upstream" while on detached HEAD segfaulted
- instead of noticing that such an operation did not make sense.
-
- Getting tired of waiting for a reroll; will discard.
-
---------------------------------------------------
-[Cooking]
* mp/absorb-submodule-git-dir-upon-deinit (2021-11-19) 1 commit
- submodule: absorb git dir instead of dying on deinit
Will merge to 'next'.
-* ab/update-submitting-patches (2021-11-13) 1 commit
- (merged to 'next' on 2021-11-19 at b44f4d0eb0)
- + SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section
-
- Doc fix.
-
- Will merge to 'master'.
-
-
* bc/require-c99 (2021-11-18) 1 commit
- - git-compat-util: add a test balloon for C99 support
+ . git-compat-util: add a test balloon for C99 support
Weather balloon to break people with compilers that do not support
C99.
-* jc/c99-var-decl-in-for-loop (2021-11-16) 1 commit
+* jc/c99-var-decl-in-for-loop (2021-11-22) 1 commit
- revision: use C99 declaration of variable in for() loop
Weather balloon to break comiplers that do not grok variable
More tests are marked as leak-free.
- Will merge to 'next'?
+ Will merge to 'next'.
* if/redact-packfile-uri (2021-11-11) 2 commits
Doc update.
- Will merge to 'next'?
+ Will merge to 'next'.
* jc/unsetenv-returns-an-int (2021-10-29) 1 commit
mimic ancient, non-POSIX, variant seen in an old glibc; it has been
changed to return an integer to match the more modern era.
- Will cook in 'next'.
+ Will merge to 'master'.
* mc/clean-smudge-with-llp64 (2021-11-03) 8 commits
The clean/smudge conversion code path has been prepared to better
work on platforms where ulong is narrower than size_t.
- Will cook in 'next'.
+ Will merge to 'master'.
* pw/diff-color-moved-fix (2021-10-27) 15 commits
Make a few helper functions unused and then lose them.
- Will cook in 'next'.
+ Will merge to 'master'.
* ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits
Allow "git status --porcelain=v2" to show the number of stash
entries with --show-stash like the normal output does.
- Will cook in 'next'.
+ Will merge to 'master'.
* tb/plug-pack-bitmap-leaks (2021-10-28) 9 commits
Leakfix.
- Will cook in 'next'.
+ Will merge to 'master'.
* es/pretty-describe-more (2021-11-01) 3 commits
Code clean-up to eventually allow information on remotes defined
for an arbitrary repository to be read.
- Will merge to 'next'?
+ Will merge to 'next'.
* jk/loosen-urlmatch (2021-10-12) 1 commit
Treat "_" as any other URL-valid characters in an URL when matching
the per-URL configuration variable names.
- Will cook in 'next'.
+ Will merge to 'master'.
-* ab/config-based-hooks-2 (2021-11-01) 18 commits
+* ab/config-based-hooks-2 (2021-11-24) 18 commits
- run-command: remove old run_hook_{le,ve}() hook API
- receive-pack: convert push-to-checkout hook to hook.h
- read-cache: convert post-index-change to use hook.h
"git stash" learned the "--staged" option to stash away what has
been added to the index (and nothing else).
- Will cook in 'next'.
+ Will merge to 'master'.
-* vd/sparse-sparsity-fix-on-read (2021-10-27) 3 commits
+* vd/sparse-sparsity-fix-on-read (2021-11-24) 4 commits
- sparse-index: update do_read_index to ensure correct sparsity
- sparse-index: add ensure_correct_sparsity function
+ - sparse-index: avoid unnecessary cache tree clearing
- test-read-cache.c: prepare_repo_settings after config init
Ensure that the sparseness of the in-core index matches the
index.sparse configuration specified by the repository immediately
after the on-disk index file is read.
- Will merge to 'next'?
+ Will merge to 'next'.
* jc/fix-ref-sorting-parse (2021-10-20) 2 commits
sort key information, no longer errors out by seeing a bogus sort
key.
- Will cook in 'next'.
+ Will merge to 'master'.
* jc/tutorial-format-patch-base (2021-10-23) 1 commit
Teach and encourage first-time contributors to this project to
state the base commit when they submit their topic.
- Will cook in 'next'.
+ Will merge to 'master'.
* js/branch-track-inherit (2021-11-18) 1 commit
Various operating modes of "git reset" have been made to work
better with the sparse index.
- Will merge to 'next'?
+ Will merge to 'next'.
* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
The command line complation for "git send-email" options have been
tweaked to make it easier to keep it in sync with the command itself.
- Will cook in 'next'.
+ Will merge to 'master'.
* ns/batched-fsync (2021-10-27) 9 commits
The "remainder" of hn/refs-errno-cleanup topic.
- Will cook in 'next'.
+ Will merge to 'master'.
* ab/only-single-progress-at-once (2021-11-03) 8 commits
The "reftable" backend for the refs API, without integrating into
the refs subsystem.
- Will merge to 'next'?
+ Will merge to 'next'.
projects / thirdparty / git.git / commitdiff
