The second batch for 2.36

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

Junio C Hamano committed Feb 9, 2022 at 14:21 UTC 2b9c1209706bc2ef0ab09fb0bdc7d405e225ce8b
1 file changed +59 -1
Documentation/RelNotes/2.36.0.txt
+59 -1
@@ -6,7 +6,8 @@ Updates since Git 2.35
6
7 Backward compatibility warts
8
9 - *
9 + * "git name-rev --stdin" has been deprecated and issues a warning
10 + when used; use "git name-rev --annotate-stdin" instead.
11
12
13 Note to those who build from the source
@@ -31,6 +32,15 @@ Performance, Internal Implementation, Development Support etc.
32
33 * Use the parse-options API in "git reflog" command.
34
35 + * The conditional inclusion mechanism of configuration files using
36 + "[includeIf <condition>]" learns to base its decision on the
37 + URL of the remote repository the repository interacts with.
38 + (merge 399b198489 jt/conditional-config-on-remote-url later to maint).
39 +
40 + * "git name-rev --stdin" does not behave like usual "--stdin" at
41 + all. Start the process of renaming it to "--annotate-stdin".
42 + (merge a2585719b3 jc/name-rev-stdin later to maint).
43 +
44
45 Fixes since v2.35
46 -----------------
@@ -47,8 +57,56 @@ Fixes since v2.35
57 racy timestamps (just like "git status" already does).
58 (merge 2ede073fd2 ms/update-index-racy later to maint).
59
60 + * Avoid tests that are run under GIT_TRACE2 set from failing
61 + unnecessarily.
62 + (merge 944d808e42 js/test-unset-trace2-parents later to maint).
63 +
64 + * The merge-ort misbehaved when merge.renameLimit configuration is
65 + set too low and failed to find all renames.
66 + (merge 9ae39fef7f en/merge-ort-restart-optim-fix later to maint).
67 +
68 + * We explain that revs come first before the pathspec among command
69 + line arguments, but did not spell out that dashed options come
70 + before other args, which has been corrected.
71 + (merge c11f95010c tl/doc-cli-options-first later to maint).
72 +
73 + * "git add -p" rewritten in C regressed hunk splitting in some cases,
74 + which has been corrected.
75 + (merge 7008ddc645 pw/add-p-hunk-split-fix later to maint).
76 +
77 + * "git fetch --negotiate-only" is an internal command used by "git
78 + push" to figure out which part of our history is missing from the
79 + other side. It should never recurse into submodules even when
80 + fetch.recursesubmodules configuration variable is set, nor it
81 + should trigger "gc". The code has been tightened up to ensure it
82 + only does common ancestry discovery and nothing else.
83 + (merge de4eaae63a gc/fetch-negotiate-only-early-return later to maint).
84 +
85 + * The code path that verifies signatures made with ssh were made to
86 + work better on a system with CRLF line endings.
87 + (merge caeef01ea7 fs/ssh-signing-crlf later to maint).
88 +
89 + * "git sparse-checkout init" failed to write into $GIT_DIR/info
90 + directory when the repository was created without one, which has
91 + been corrected to auto-create it.
92 + (merge 7f44842ac1 jt/sparse-checkout-leading-dir-fix later to maint).
93 +
94 + * Cloning from a repository that does not yet have any branches or
95 + tags but has other refs resulted in a "remote transport reported
96 + error", which has been corrected.
97 + (merge dccea605b6 jt/clone-not-quite-empty later to maint).
98 +
99 + * Mark in various places in the code that the sparse index and the
100 + split index features are mutually incompatible.
101 + (merge 451b66c533 js/sparse-vs-split-index later to maint).
102 +
103 + * Update the logic to compute alignment requirement for our mem-pool.
104 + (merge e38bcc66d8 jc/mem-pool-alignment later to maint).
105 +
106 * Other code cleanup, docfix, build fix, etc.
107 (merge cfc5cf428b jc/find-header later to maint).
108 (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).
109 (merge 727e6ea350 jh/p4-spawning-external-commands-cleanup later to maint).
110 (merge 0a6adc26e2 rs/grep-expr-cleanup later to maint).
111 + (merge 4ed7dfa713 po/readme-mention-contributor-hints later to maint).
112 + (merge 6046f7a91c en/plug-leaks-in-merge later to maint).