Fifth batch for 2.5 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 26, 2015 at 13:33 UTC
4ebdeb68ba87282f87c39d790ba17fe1e021cc97
1 file changed
+28
-6
Documentation/RelNotes/2.5.0.txt
+28
-6
@@ -79,12 +79,16 @@ UI, Workflows & Features
79
80
* The Git subcommand completion (in contrib/) listed credential
81
helpers among candidates, which is not something the end user would
82
- invoke interatively.
82
+ invoke interactively.
83
+
84
+ * The index file can be taught with "update-index --untracked-cache"
85
+ to optionally remember already seen untracked files, in order to
86
+ speed up "git status" in a working tree with tons of cruft.
87
88
89
Performance, Internal Implementation, Development Support etc.
90
87
- * "unsigned char [20]" used thoughout the code to represent object
91
+ * "unsigned char [20]" used throughout the code to represent object
92
names are being converted into a semi-opaque "struct object_id".
93
This effort is expected to interfere with other topics in flight,
94
but hopefully will give us one extra level of abstraction in the
@@ -180,9 +184,9 @@ notes for details).
184
* Some time ago, "git blame" (incorrectly) lost the convert_to_git()
185
call when synthesizing a fake "tip" commit that represents the
186
state in the working tree, which broke folks who record the history
183
- with LF line ending to make their project portabile across
184
- platforms while terminating lines in their working tree files with
185
- CRLF for their platform.
187
+ with LF line ending to make their project portable across platforms
188
+ while terminating lines in their working tree files with CRLF for
189
+ their platform.
190
(merge 4bf256d tb/blame-resurrect-convert-to-git later to maint).
191
192
* We avoid setting core.worktree when the repository location is the
@@ -208,7 +212,7 @@ notes for details).
212
(merge 27547e5 cn/bom-in-gitignore later to maint).
213
214
* a few helper scripts in the test suite did not report errors
211
- correcty.
215
+ correctly.
216
(merge de248e9 ep/fix-test-lib-functions-report later to maint).
217
218
* The default $HOME/.gitconfig file created upon "git config --global"
@@ -308,6 +312,24 @@ notes for details).
312
(merge ad3967a jk/stripspace-asciidoctor-fix later to maint).
313
(merge 975e382 ja/tutorial-asciidoctor-fix later to maint).
314
315
+ * The code to read pack-bitmap wanted to allocate a few hundred
316
+ pointers to a structure, but by mistake allocated and leaked memory
317
+ enough to hold that many actual structures. Correct the allocation
318
+ size and also have it on stack, as it is small enough.
319
+ (merge 599dc76 rs/plug-leak-in-pack-bitmaps later to maint).
320
+
321
+ * The pull.ff configuration was supposed to override the merge.ff
322
+ configuration, but it didn't.
323
+ (merge db9bb28 pt/pull-ff-vs-merge-ff later to maint).
324
+
325
+ * "git pull --log" and "git pull --no-log" worked as expected, but
326
+ "git pull --log=20" did not.
327
+ (merge 5061a44 pt/pull-log-n later to maint).
328
+
329
+ * "git rerere forget" in a repository without rerere enabled gave a
330
+ cryptic error message; it should be a silent no-op instead.
331
+ (merge 0544574 jk/rerere-forget-check-enabled later to maint).
332
+
333
* Code cleanups and documentation updates.
334
(merge 0269f96 mm/usage-log-l-can-take-regex later to maint).
335
(merge 64f2589 nd/t1509-chroot-test later to maint).