Sync with 'maint'
diff --git a/Documentation/RelNotes/2.45.3.txt b/Documentation/RelNotes/2.45.3.txt
index 90098d2..2a1e9aa 100644
--- a/Documentation/RelNotes/2.45.3.txt
+++ b/Documentation/RelNotes/2.45.3.txt
@@ -77,4 +77,31 @@
* Varargs functions that are unannotated as printf-like or execl-like
have been annotated as such.
+ * The "-k" and "--rfc" options of "format-patch" will now error out
+ when used together, as one tells us not to add anything to the
+ title of the commit, and the other one tells us to add "RFC" in
+ addition to "PATCH".
+
+ * When the user adds to "git rebase -i" instruction to "pick" a merge
+ commit, the error experience is not pleasant. Such an error is now
+ caught earlier in the process that parses the todo list.
+
+ * We forgot to normalize the result of getcwd() to NFC on macOS where
+ all other paths are normalized, which has been corrected. This still
+ does not address the case where core.precomposeUnicode configuration
+ is not defined globally.
+
+ * Earlier we stopped using the tree of HEAD as the default source of
+ attributes in a bare repository, but failed to document it. This
+ has been corrected.
+
+ * An unused extern declaration for mingw has been removed to prevent
+ it from causing build failure.
+
+ * A helper function shared between two tests had a copy-paste bug,
+ which has been corrected.
+
+ * "git fetch-pack -k -k" without passing "--lock-pack" (which we
+ never do ourselves) did not work at all, which has been corrected.
+
Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.46.0.txt b/Documentation/RelNotes/2.46.0.txt
index eac9471..67bae07 100644
--- a/Documentation/RelNotes/2.46.0.txt
+++ b/Documentation/RelNotes/2.46.0.txt
@@ -217,7 +217,6 @@
when used together, as one tells us not to add anything to the
title of the commit, and the other one tells us to add "RFC" in
addition to "PATCH".
- (merge cadcf58085 ds/format-patch-rfc-and-k later to maint).
* "git stash -S" did not handle binary files correctly, which has
been corrected.
@@ -317,18 +316,15 @@
* When the user adds to "git rebase -i" instruction to "pick" a merge
commit, the error experience is not pleasant. Such an error is now
caught earlier in the process that parses the todo list.
- (merge 4c063c82e9 pw/rebase-i-error-message later to maint).
* We forgot to normalize the result of getcwd() to NFC on macOS where
all other paths are normalized, which has been corrected. This still
does not address the case where core.precomposeUnicode configuration
is not defined globally.
- (merge 71fa8d2212 tb/precompose-getcwd later to maint).
* Earlier we stopped using the tree of HEAD as the default source of
attributes in a bare repository, but failed to document it. This
has been corrected.
- (merge 5c71d6b63a jc/no-default-attr-tree-in-bare later to maint).
* "git update-server-info" and "git commit-graph --write" have been
updated to use the tempfile API to avoid leaving cruft after
@@ -336,15 +332,12 @@
* An unused extern declaration for mingw has been removed to prevent
it from causing build failure.
- (merge 3c295c87c2 js/mingw-remove-unused-extern-decl later to maint).
* A helper function shared between two tests had a copy-paste bug,
which has been corrected.
- (merge 40d817875d jk/t5500-typofix later to maint).
* "git fetch-pack -k -k" without passing "--lock-pack" (which we
never do ourselves) did not work at all, which has been corrected.
- (merge 96a6621d25 jk/fetch-pack-fsck-wo-lock-pack later to maint).
* CI job to build minimum fuzzers learned to pass NO_CURL=NoThanks to
the build procedure, as its build environment does not offer, or
@@ -356,6 +349,4 @@
(merge 0f4b0d4cf0 rs/diff-color-moved-w-no-ext-diff-fix later to maint).
* Other code cleanup, docfix, build fix, etc.
- (merge bf6a86236e jc/worktree-git-path later to maint).
- (merge 28dc26dc33 rs/remove-unused-find-header-mem later to maint).
(merge 493fdae046 ew/object-convert-leakfix later to maint).
