Git 2.33.1

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4fA2sf7nIh/HeOzvsLXohpav5ssFAmFl9YQACgkQsLXohpav
 5st9UA/+NM0VnPxmGa1177UbzMnT7LeJ3+hh/+IQHfgJ8/8anOLw5ZksXEIcFfpe
 GEykvwTm0nIiZDj5g+x5o+oJsQxXFKqE3ZmhJpdpSiQfvUI+FsjjrwilDD89x199
 GdCDvkB6rUQjnaJMwIV06B9Jxn0rQlgFyheDq8s3SXt0Kz2DRz1H4BEAFqbU+m5P
 EKhJtl4qxBCewuon+0QEI58dUn4Y3UOcs6VXZwZTi5UGKZgzAcgp6pWE7IsgSLVm
 YTV6Hnp1At7cSgMcJSK73R6jJbEbkxDunLoydMu4xrhbHP3zmYu1mzbQEfBi9u4q
 ifwbD2iw1flf45BuHkVAgDqeTMq604uxBI5QRpaQ0PwUkoe0fIjQrlKuKRItlJEn
 6cZvQ87jC6xL4KiD8bzfCnFV2TdYtQyHC0x0AupzhGE2i+6W+UwgkNrCqGOc7Tf0
 Q/fG0AJrbyOOnOe4Vo5+dZ0o1lYBzg67SkkWDBHDAvJqHs9OV9Q+a7qcF9S8Kd9F
 HDvgHdmGCBq1nDPENB0urPRDAomzJGlINNiXZoeAmU+HXFpipyFaEBv0DAH5pudP
 xbSBA8zWXaKwLrafXBneoPjic5CTUqykEYXvAHqEEi1y9Zlnw0aik/FdFTy/7DvB
 pzINMI7RCUUP2QCXBftQoyN51uI8XZn+Ilzx6Hkl/IgMF0SumQY=
 =KmdG
 -----END PGP SIGNATURE-----

Sync with Git 2.33.1

Documentation/RelNotes/2.33.1.txt

@@ -0,0 +1,138 @@
+Git 2.33.1 Release Notes
+========================
+
+This primarily is to backport various fixes accumulated during the
+development towards Git 2.34, the next feature release.
+
+
+Fixes since v2.33
+-----------------
+
+ * The unicode character width table (used for output alignment) has
+   been updated.
+
+ * Input validation of "git pack-objects --stdin-packs" has been
+   corrected.
+
+ * Bugfix for common ancestor negotiation recently introduced in "git
+   push" codepath.
+
+ * "git pull" had various corner cases that were not well thought out
+   around its --rebase backend, e.g. "git pull --ff-only" did not stop
+   but went ahead and rebased when the history on other side is not a
+   descendant of our history.  The series tries to fix them up.
+
+ * "git apply" miscounted the bytes and failed to read to the end of
+   binary hunks.
+
+ * "git range-diff" code clean-up.
+
+ * "git commit --fixup" now works with "--edit" again, after it was
+   broken in v2.32.
+
+ * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
+   new version has a blocker bug for that architecture.
+
+ * Checking out all the paths from HEAD during the last conflicted
+   step in "git rebase" and continuing would cause the step to be
+   skipped (which is expected), but leaves MERGE_MSG file behind in
+   $GIT_DIR and confuses the next "git commit", which has been
+   corrected.
+
+ * Various bugs in "git rebase -r" have been fixed.
+
+ * mmap() imitation used to call xmalloc() that dies upon malloc()
+   failure, which has been corrected to just return an error to the
+   caller to be handled.
+
+ * "git diff --relative" segfaulted and/or produced incorrect result
+   when there are unmerged paths.
+
+ * The delayed checkout code path in "git checkout" etc. were chatty
+   even when --quiet and/or --no-progress options were given.
+
+ * "git branch -D <branch>" used to refuse to remove a broken branch
+   ref that points at a missing commit, which has been corrected.
+
+ * Build update for Apple clang.
+
+ * The parser for the "--nl" option of "git column" has been
+   corrected.
+
+ * "git upload-pack" which runs on the other side of "git fetch"
+   forgot to take the ref namespaces into account when handling
+   want-ref requests.
+
+ * The sparse-index support can corrupt the index structure by storing
+   a stale and/or uninitialized data, which has been corrected.
+
+ * Buggy tests could damage repositories outside the throw-away test
+   area we created.  We now by default export GIT_CEILING_DIRECTORIES
+   to limit the damage from such a stray test.
+
+ * Even when running "git send-email" without its own threaded
+   discussion support, a threading related header in one message is
+   carried over to the subsequent message to result in an unwanted
+   threading, which has been corrected.
+
+ * The output from "git fast-export", when its anonymization feature
+   is in use, showed an annotated tag incorrectly.
+
+ * Recent "diff -m" changes broke "gitk", which has been corrected.
+
+ * "git maintenance" scheduler fix for macOS.
+
+ * A pathname in an advice message has been made cut-and-paste ready.
+
+ * The "git apply -3" code path learned not to bother the lower level
+   merge machinery when the three-way merge can be trivially resolved
+   without the content level merge.
+
+ * The code that optionally creates the *.rev reverse index file has
+   been optimized to avoid needless computation when it is not writing
+   the file out.
+
+ * "git range-diff -I... <range> <range>" segfaulted, which has been
+   corrected.
+
+ * The order in which various files that make up a single (conceptual)
+   packfile has been reevaluated and straightened up.  This matters in
+   correctness, as an incomplete set of files must not be shown to a
+   running Git.
+
+ * The "mode" word is useless in a call to open(2) that does not
+   create a new file.  Such a call in the files backend of the ref
+   subsystem has been cleaned up.
+
+ * "git update-ref --stdin" failed to flush its output as needed,
+   which potentially led the conversation to a deadlock.
+
+ * When "git am --abort" fails to abort correctly, it still exited
+   with exit status of 0, which has been corrected.
+
+ * Correct nr and alloc members of strvec struct to be of type size_t.
+
+ * "git stash", where the tentative change involves changing a
+   directory to a file (or vice versa), was confused, which has been
+   corrected.
+
+ * "git clone" from a repository whose HEAD is unborn into a bare
+   repository didn't follow the branch name the other side used, which
+   is corrected.
+
+ * "git cvsserver" had a long-standing bug in its authentication code,
+   which has finally been corrected (it is unclear and is a separate
+   question if anybody is seriously using it, though).
+
+ * "git difftool --dir-diff" mishandled symbolic links.
+
+ * Sensitive data in the HTTP trace were supposed to be redacted, but
+   we failed to do so in HTTP/2 requests.
+
+ * "make clean" has been updated to remove leftover .depend/
+   directories, even when it is not told to use them to compute header
+   dependencies.
+
+ * Protocol v0 clients can get stuck parsing a malformed feature line.
+
+Also contains various documentation updates and code clean-ups.

Documentation/RelNotes/2.34.0.txt

@@ -152,205 +152,130 @@ Fixes since v2.33
 
  * Input validation of "git pack-objects --stdin-packs" has been
    corrected.
-   (merge 561fa03529 ab/pack-stdin-packs-fix later to maint).
 
  * Bugfix for common ancestor negotiation recently introduced in "git
    push" code path.
-   (merge 82823118b9 jt/push-negotiation-fixes later to maint).
 
  * "git pull" had various corner cases that were not well thought out
    around its --rebase backend, e.g. "git pull --ff-only" did not stop
    but went ahead and rebased when the history on other side is not a
    descendant of our history.  The series tries to fix them up.
-   (merge 6f843a3355 en/pull-conflicting-options later to maint).
 
  * "git apply" miscounted the bytes and failed to read to the end of
    binary hunks.
-   (merge 46d723ce57 jk/apply-binary-hunk-parsing-fix later to maint).
 
  * "git range-diff" code clean-up.
-   (merge c4d5907324 jk/range-diff-fixes later to maint).
 
  * "git commit --fixup" now works with "--edit" again, after it was
    broken in v2.32.
-   (merge 8ef6aad664 jk/commit-edit-fixup-fix later to maint).
 
  * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
    new version has a blocker bug for that architecture.
-   (merge 3cf9bb36bf cb/ci-use-upload-artifacts-v1 later to maint).
 
  * Checking out all the paths from HEAD during the last conflicted
    step in "git rebase" and continuing would cause the step to be
    skipped (which is expected), but leaves MERGE_MSG file behind in
    $GIT_DIR and confuses the next "git commit", which has been
    corrected.
-   (merge e5ee33e855 pw/rebase-skip-final-fix later to maint).
 
  * Various bugs in "git rebase -r" have been fixed.
-   (merge f2563c9ef3 pw/rebase-r-fixes later to maint).
 
  * mmap() imitation used to call xmalloc() that dies upon malloc()
    failure, which has been corrected to just return an error to the
    caller to be handled.
-   (merge 95b4ff3931 rs/git-mmap-uses-malloc later to maint).
 
  * "git diff --relative" segfaulted and/or produced incorrect result
    when there are unmerged paths.
-   (merge 8174627b3d dd/diff-files-unmerged-fix later to maint).
 
  * The delayed checkout code path in "git checkout" etc. were chatty
    even when --quiet and/or --no-progress options were given.
-   (merge 7a132c628e mt/quiet-with-delayed-checkout later to maint).
 
  * "git branch -D <branch>" used to refuse to remove a broken branch
    ref that points at a missing commit, which has been corrected.
-   (merge 597a977489 rs/branch-allow-deleting-dangling later to maint).
 
  * Build update for Apple clang.
-   (merge f32c5d3716 cb/makefile-apple-clang later to maint).
 
  * The parser for the "--nl" option of "git column" has been
    corrected.
-   (merge c93ca46cf5 sg/column-nl later to maint).
 
  * "git upload-pack" which runs on the other side of "git fetch"
    forgot to take the ref namespaces into account when handling
    want-ref requests.
-   (merge 53a66ec37c ka/want-ref-in-namespace later to maint).
 
  * The sparse-index support can corrupt the index structure by storing
    a stale and/or uninitialized data, which has been corrected.
-   (merge d9e9b44d7a jh/sparse-index-resize-fix later to maint).
 
  * Buggy tests could damage repositories outside the throw-away test
    area we created.  We now by default export GIT_CEILING_DIRECTORIES
    to limit the damage from such a stray test.
-   (merge 614c3d8f2e sg/set-ceiling-during-tests later to maint).
 
  * Even when running "git send-email" without its own threaded
    discussion support, a threading related header in one message is
    carried over to the subsequent message to result in an unwanted
    threading, which has been corrected.
-   (merge e082113484 mh/send-email-reset-in-reply-to later to maint).
 
  * The output from "git fast-export", when its anonymization feature
    is in use, showed an annotated tag incorrectly.
-   (merge 2f040a9671 tk/fast-export-anonymized-tag-fix later to maint).
 
  * Doc update plus improved error reporting.
-   (merge 1e93770888 jk/log-warn-on-bogus-encoding later to maint).
 
  * Recent "diff -m" changes broke "gitk", which has been corrected.
-   (merge 5acffd3473 so/diff-index-regression-fix later to maint).
 
  * Regression fix.
-   (merge b996f84989 ab/send-email-config-fix later to maint).
 
  * The "git apply -3" code path learned not to bother the lower level
    merge machinery when the three-way merge can be trivially resolved
    without the content level merge.  This fixes a regression caused by
    recent "-3way first and fall back to direct application" change.
-   (merge 57f183b698 jc/trivial-threeway-binary-merge later to maint).
 
  * The code that optionally creates the *.rev reverse index file has
    been optimized to avoid needless computation when it is not writing
    the file out.
-   (merge 8fe8bae9d2 ab/reverse-midx-optim later to maint).
 
  * "git range-diff -I... <range> <range>" segfaulted, which has been
    corrected.
-   (merge 709b3f32d3 rs/range-diff-avoid-segfault-with-I later to maint).
 
  * The order in which various files that make up a single (conceptual)
    packfile has been reevaluated and straightened up.  This matters in
    correctness, as an incomplete set of files must not be shown to a
    running Git.
-   (merge 4bc1fd6e39 tb/pack-finalize-ordering later to maint).
 
  * The "mode" word is useless in a call to open(2) that does not
    create a new file.  Such a call in the files backend of the ref
    subsystem has been cleaned up.
-   (merge 35cf94eaf6 rs/no-mode-to-open-when-appending later to maint).
 
  * "git update-ref --stdin" failed to flush its output as needed,
    which potentially led the conversation to a deadlock.
-   (merge 7c1200745b ps/update-ref-batch-flush later to maint).
 
  * When "git am --abort" fails to abort correctly, it still exited
    with exit status of 0, which has been corrected.
-   (merge c5ead19ea2 en/am-abort-fix later to maint).
 
  * Correct nr and alloc members of strvec struct to be of type size_t.
-   (merge 8d133a4653 jk/strvec-typefix later to maint).
 
  * "git stash", where the tentative change involves changing a
    directory to a file (or vice versa), was confused, which has been
    corrected.
-   (merge bee8691f19 en/stash-df-fix later to maint).
 
  * "git clone" from a repository whose HEAD is unborn into a bare
    repository didn't follow the branch name the other side used, which
    is corrected.
-   (merge 6b58df54cf jk/clone-unborn-head-in-bare later to maint).
 
  * "git cvsserver" had a long-standing bug in its authentication code,
    which has finally been corrected (it is unclear and is a separate
    question if anybody is seriously using it, though).
-   (merge 4b81f690f6 cb/cvsserver later to maint).
 
  * "git difftool --dir-diff" mishandled symbolic links.
-   (merge 5bafb3576a da/difftool-dir-diff-symlink-fix later to maint).
 
  * Sensitive data in the HTTP trace were supposed to be redacted, but
    we failed to do so in HTTP/2 requests.
-   (merge b66c77a64e jk/http-redact-fix later to maint).
 
  * "make clean" has been updated to remove leftover .depend/
    directories, even when it is not told to use them to compute header
    dependencies.
-   (merge f0a74bcb03 ab/make-clean-depend-dirs later to maint).
 
  * Protocol v0 clients can get stuck parsing a malformed feature line.
-   (merge 44d2aec6e8 ah/connect-parse-feature-v0-fix later to maint).
 
  * Other code cleanup, docfix, build fix, etc.
-   (merge 1d9c8daef8 ab/bundle-doc later to maint).
-   (merge 81483fe613 en/merge-strategy-docs later to maint).
-   (merge 626beebdf8 js/log-protocol-version later to maint).
-   (merge 00e302da76 cb/builtin-merge-format-string-fix later to maint).
-   (merge ad51ae4dc0 cb/ci-freebsd-update later to maint).
-   (merge be6444d1ca fc/completion-updates later to maint).
-   (merge ff7b83f562 ti/tcsh-completion-regression-fix later to maint).
-   (merge 325b06deda sg/make-fix-ar-invocation later to maint).
-   (merge bd72824c60 me/t5582-cleanup later to maint).
-   (merge f6a5af0f62 ga/send-email-sendmail-cmd later to maint).
-   (merge f58c7468cd ab/ls-remote-packet-trace later to maint).
-   (merge 0160f7e725 ab/rebase-fatal-fatal-fix later to maint).
-   (merge a16eb6b1ff js/maintenance-launchctl-fix later to maint).
-   (merge c21b2511c2 jk/t5323-no-pack-test-fix later to maint).
-   (merge 5146c2f148 mh/credential-leakfix later to maint).
-   (merge 1549577338 dd/t6300-wo-gpg-fix later to maint).
-   (merge 66e905b7dd rs/xopen-reports-open-failures later to maint).
-   (merge 469888e6a5 es/walken-tutorial-fix later to maint).
-   (merge 88682b016d ba/object-info later to maint).
-   (merge b45c172e51 ab/gc-log-rephrase later to maint).
-   (merge ccdd5d1eb1 ab/mailmap-leakfix later to maint).
-   (merge 6540b71614 cb/remote-ndebug-fix later to maint).
-   (merge e4f8d27585 rs/show-branch-simplify later to maint).
-   (merge e124ecf7f7 rs/archive-use-object-id later to maint).
-   (merge cebead1ebf cb/ci-build-pedantic later to maint).
-   (merge ca0cc98e03 bs/doc-bugreport-outdir later to maint).
-   (merge 72b113e562 ab/no-more-check-bindir later to maint).
-   (merge 92a5d1c9b4 jc/prefix-filename-allocates later to maint).
-   (merge d9a65b6c0a rs/setup-use-xopen-and-xdup later to maint).
-   (merge e8f55568de jk/t5562-racefix later to maint).
-   (merge 8f0f110156 rs/drop-core-compression-vars later to maint).
-   (merge b6d8887d3d ma/doc-git-version later to maint).
-   (merge 66c0c44df6 cb/plug-leaks-in-alloca-emu-users later to maint).
-   (merge afb32e8101 kz/revindex-comment-fix later to maint).
-   (merge ae578de926 po/git-config-doc-mentions-help-c later to maint).
-   (merge 187fc8b8b6 cb/unicode-14 later to maint).
-   (merge 3584cff71c en/typofixes later to maint).
    (merge f188160be9 ab/bundle-remove-verbose-option later to maint).
    (merge 8c6b4332b4 rs/close-pack-leakfix later to maint).
    (merge 51b04c05b7 bs/difftool-msg-tweak later to maint).