Ninth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 19, 2020 at 16:14 UTC
675a4aaf3b226c0089108221b96559e0baae5de9
1 file changed
+43
-1
Documentation/RelNotes/2.29.0.txt
+43
-1
@@ -33,6 +33,10 @@ UI, Workflows & Features
33
been made to imply "-m". Use "--no-diff-merges" to restore the
34
previous behaviour to omit patches for merge commits.
35
36
+ * The commit labels used to explain each side of conflicted hunks
37
+ placed by the sequencer machinery have been made more readable by
38
+ humans.
39
+
40
41
Performance, Internal Implementation, Development Support etc.
42
@@ -66,7 +70,9 @@ Performance, Internal Implementation, Development Support etc.
70
to a certain degree. It has been renamed to "strvec" to reduce the
71
barrier to adoption.
72
69
- * The final leg of SHA-256 transition.
73
+ * The final leg of SHA-256 transition plus doc updates. Note that
74
+ there is no inter-operability between SHA-1 and SHA-256
75
+ repositories yet.
76
77
* CMake support to build with MSVC for Windows bypassing the Makefile.
78
@@ -82,6 +88,13 @@ Performance, Internal Implementation, Development Support etc.
88
* Test framework update.
89
(merge d572f52a64 es/test-cmp-typocatcher later to maint).
90
91
+ * Updates to "git merge" tests, in preparation for a new merge
92
+ strategy backend.
93
+
94
+ * midx and commit-graph files now use the byte defined in their file
95
+ format specification for identifying the hash function used for
96
+ object names.
97
+
98
99
Fixes since v2.28
100
-----------------
@@ -145,6 +158,31 @@ Fixes since v2.28
158
command failed to do so for such a path.
159
(merge 4c025c667e rp/apply-cached-with-i-t-a later to maint).
160
161
+ * "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
162
+ bit was not showing the mode bits from the working tree.
163
+ (merge cb0dd22b82 rp/ita-diff-modefix later to maint).
164
+
165
+ * Ring buffer with size 4 used for bin-hex translation resulted in a
166
+ wrong object name in the sequencer's todo output, which has been
167
+ corrected.
168
+ (merge 5da69c0dac ak/sequencer-fix-find-uniq-abbrev later to maint).
169
+
170
+ * When given more than one target line ranges, "git blame -La,b
171
+ -Lc,d" was over-eager to coalesce groups of original lines and
172
+ showed incorrect results, which has been corrected.
173
+ (merge c2ebaa27d6 jk/blame-coalesce-fix later to maint).
174
+
175
+ * The regexp to identify the function boundary for FORTRAN programs
176
+ has been updated.
177
+ (merge 75c3b6b2e8 pb/userdiff-fortran-update later to maint).
178
+
179
+ * A few end-user facing messages have been updated to be
180
+ hash-algorithm agnostic.
181
+ (merge 4279000d3e jc/object-names-are-not-sha-1 later to maint).
182
+
183
+ * "unlink" emulation on MinGW has been optimized.
184
+ (merge 680e0b4524 jh/mingw-unlink later to maint).
185
+
186
* Other code cleanup, docfix, build fix, etc.
187
(merge 84544f2ea3 sk/typofixes later to maint).
188
(merge b17f411ab5 ar/help-guides-doc later to maint).
@@ -160,3 +198,7 @@ Fixes since v2.28
198
(merge f649aaaf82 so/rev-parser-errormessage-fix later to maint).
199
(merge 6103d58b7f bc/sha-256-cvs-svn-updates later to maint).
200
(merge ac900fddb7 ma/stop-progress-null-fix later to maint).
201
+ (merge e767963ab6 rs/upload-pack-sigchain-fix later to maint).
202
+ (merge a831908599 rs/preserve-merges-unused-code-removal later to maint).
203
+ (merge 6dfefe70a9 jb/commit-graph-doc-fix later to maint).
204
+ (merge 847b37271e pb/set-url-docfix later to maint).