@@ -14,11 +14,16 @@ Backward compatibility notes.
14
14
eventually the warning can be turned into a hard error, upgrading
15
15
the deprecation into removal of this (mis)feature.
16
16
17
-
18
17
* The historical argument order "git merge <msg> HEAD <commit>..."
19
18
has been deprecated for quite some time, and will be removed in the
20
19
next release (not this one).
21
20
21
+ * The default abbreviation length, which has historically been 7, now
22
+ scales as the repository grows, using the approximate number of
23
+ objects in the reopsitory and a bit of math around the birthday
24
+ paradox. The logic suggests to use 12 hexdigits for the Linux
25
+ kernel, and 9 to 10 for Git itself.
26
+
22
27
23
28
Updates since v2.10
24
29
-------------------
@@ -133,6 +138,12 @@ UI, Workflows & Features
133
138
learned to turn "git describe" output (e.g. v2.9.3-599-g2376d31787)
134
139
into clickable links in its output.
135
140
141
+ * When new paths were added by "git add -N" to the index, it was
142
+ enough to circumvent the check by "git commit" to refrain from
143
+ making an empty commit without "--allow-empty". The same logic
144
+ prevented "git status" to show such a path as "new file" in the
145
+ "Changes not staged for commit" section.
146
+
136
147
137
148
Performance, Internal Implementation, Development Support etc.
138
149
@@ -212,6 +223,13 @@ Performance, Internal Implementation, Development Support etc.
212
223
by reducing use of timestamp-ordered commit-list, which was
213
224
replaced with a priority queue.
214
225
226
+ * "git diff --no-index" codepath has been updated not to try to peek
227
+ into .git/ directory that happens to be under the current
228
+ directory, when we know we are operating outside any repository.
229
+
230
+ * Update of the sequencer codebase to make it reusable to reimplement
231
+ "rebase -i" continues.
232
+
215
233
216
234
Also contains various documentation updates and code clean-ups.
217
235
@@ -518,6 +536,23 @@ notes for details).
518
536
work around them.
519
537
(merge 6750f62699 po/fix-doc-merge-base-illustration later to maint).
520
538
539
+ * A minor regression fix for "git submodule" that was introduced
540
+ when more helper functions were reimplemented in C.
541
+ (merge 77b63ac31e sb/submodule-ignore-trailing-slash later to maint).
542
+
543
+ * The code that we have used for the past 10+ years to cycle
544
+ 4-element ring buffers turns out to be not quite portable in
545
+ theoretical world.
546
+ (merge bb84735c80 rs/ring-buffer-wraparound later to maint).
547
+
548
+ * "git daemon" used fixed-length buffers to turn URL to the
549
+ repository the client asked for into the server side directory
550
+ path, using snprintf() to avoid overflowing these buffers, but
551
+ allowed possibly truncated paths to the directory. This has been
552
+ tightened to reject such a request that causes overlong path to be
553
+ required to serve.
554
+ (merge 6bdb0083be jk/daemon-path-ok-check-truncation later to maint).
555
+
521
556
* Other minor doc, test and build updates and code cleanups.
522
557
(merge a94bb68397 rs/cocci later to maint).
523
558
(merge 641c900b2c js/reset-usage later to maint).
0 commit comments