The seventh batch

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jan 5, 2022 at 13:56 UTC e83ba647f7c61cf945690d6a0bd8c172a6498dc8
1 file changed +49
Documentation/RelNotes/2.35.0.txt
+49
@@ -65,6 +65,21 @@ UI, Workflows & Features
65 * The "init" and "set" subcommands in "git sparse-checkout" have been
66 unified for a better user experience and performance.
67
68 + * Many git commands that deal with working tree files try to remove a
69 + directory that becomes empty (i.e. "git switch" from a branch that
70 + has the directory to another branch that does not would attempt
71 + remove all files in the directory and the directory itself). This
72 + drops users into an unfamiliar situation if the command was run in
73 + a subdirectory that becomes subject to removal due to the command.
74 + The commands have been taught to keep an empty directory if it is
75 + the directory they were started in to avoid surprising users.
76 +
77 + * "git am" learns "--empty=(stop|drop|keep)" option to tweak what is
78 + done to a piece of e-mail without a patch in it.
79 +
80 + * The default merge message prepared by "git merge" records the name
81 + of the current branch; the name can be overridden with a new option
82 + to allow users to pretend a merge is made on a different branch.
83
84 Performance, Internal Implementation, Development Support etc.
85
@@ -141,6 +156,21 @@ Performance, Internal Implementation, Development Support etc.
156
157 * Broken &&-chains in the test scripts have been corrected.
158
159 + * The RCS keyword substitution in "git p4" used to be done assuming
160 + that the contents are UTF-8 text, which can trigger decoding
161 + errors. We now treat the contents as a bytestring for robustness
162 + and correctness.
163 +
164 + * The conditions to choose different definitions of the FLEX_ARRAY
165 + macro for vendor compilers has been simplified to make it easier to
166 + maintain.
167 +
168 + * Correctness and performance update to "diff --color-moved" feature.
169 +
170 + * "git upload-pack" (the other side of "git fetch") used a 8kB buffer
171 + but most of its payload came on 64kB "packets". The buffer size
172 + has been enlarged so that such a packet fits.
173 +
174
175 Fixes since v2.34
176 -----------------
@@ -265,6 +295,21 @@ Fixes since v2.34
295 which has been corrected.
296 (merge 17baeaf82d ab/fetch-set-upstream-while-detached later to maint).
297
298 + * Among some code paths that ask an yes/no question, only one place
299 + gave a prompt that looked different from the others, which has been
300 + updated to match what the others create.
301 + (merge 0fc8ed154c km/help-prompt-fix later to maint).
302 +
303 + * "git log --invert-grep --author=<name>" used to exclude commits
304 + written by the given author, but now "--invert-grep" only affects
305 + the matches made by the "--grep=<pattern>" option.
306 + (merge 794c000267 rs/log-invert-grep-with-headers later to maint).
307 +
308 + * "git grep --perl-regexp" failed to match UTF-8 characters with
309 + wildcard when the pattern consists only of ASCII letters, which has
310 + been corrected.
311 + (merge 32e3e8bc55 rs/pcre2-utf later to maint).
312 +
313 * Other code cleanup, docfix, build fix, etc.
314 (merge 74db416c9c cw/protocol-v2-doc-fix later to maint).
315 (merge f9b2b6684d ja/doc-cleanup later to maint).
@@ -283,3 +328,7 @@ Fixes since v2.34
328 (merge 2c68f577fc ew/cbtree-remove-unused-and-broken-cb-unlink later to maint).
329 (merge eafd6e7e55 ab/die-with-bug later to maint).
330 (merge 91028f7659 jc/grep-patterntype-default-doc later to maint).
331 + (merge 47ca93d071 ds/repack-fixlets later to maint).
332 + (merge e6a9bc0c60 rs/t4202-invert-grep-test-fix later to maint).
333 + (merge deb5407a42 gh/gpg-doc-markup-fix later to maint).
334 + (merge 999bba3e0b rs/daemon-plug-leak later to maint).