Seventh batch for 2.7
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 26, 2015 at 16:02 UTC
37023ba381b6d251d7140a997b39b566dbc63c42
1 file changed
+36
-1
Documentation/RelNotes/2.7.0.txt
+36
-1
@@ -48,6 +48,13 @@ UI, Workflows & Features
48
* Teach "git p4" to send large blobs outside the repository by
49
talking to Git LFS.
50
51
+ * Prepare for Git on-disk repository representation to undergo
52
+ backward incompatible changes by introducing a new repository
53
+ format version "1", with an extension mechanism.
54
+ (merge 067fbd4 jk/repository-extension later to maint).
55
+
56
+ * "git worktree" learned a "list" subcommand.
57
+
58
59
Performance, Internal Implementation, Development Support etc.
60
@@ -58,7 +65,9 @@ Performance, Internal Implementation, Development Support etc.
65
66
* Some features from "git tag -l" and "git branch -l" have been made
67
available to "git for-each-ref" so that eventually the unified
61
- implementation can be shared across all three.
68
+ implementation can be shared across all three. The version merged
69
+ to the 'master' branch earlier had a performance regression in "tag
70
+ --contains", which has since been corrected.
71
72
* Because "test_when_finished" in our test framework queues the
73
clean-up tasks to be done in a shell variable, it should not be
@@ -83,6 +92,11 @@ Performance, Internal Implementation, Development Support etc.
92
followed by strcpy/sprintf have been replaced with a less error
93
prone constructs such as xstrfmt.
94
95
+ * The internal stripspace() function has been moved to where it
96
+ logically belongs to, i.e. strbuf API, and the command line parser
97
+ of "git stripspace" has been updated to use the parse_options API.
98
+ (merge bed4452 tk/stripspace later to maint).
99
+
100
101
Also contains various documentation updates and code clean-ups.
102
@@ -224,6 +238,26 @@ notes for details).
238
but a test insisted that the function drops a trailing slash.
239
(merge b2a7123 rd/test-path-utils later to maint).
240
241
+ * A test for interaction between untracked cache and sparse checkout
242
+ added in Git 2.5 days were flaky.
243
+ (merge 9b680fb dt/t7063-fix-flaky-test later to maint).
244
+
245
+ * A couple of commands still showed "[options]" in their usage string
246
+ to note where options should come on their command line, but we
247
+ spell that "[<options>]" in most places these days.
248
+ (merge d96a031 rt/placeholder-in-usage later to maint).
249
+
250
+ * The synopsis text and the usage string of subcommands that read
251
+ list of things from the standard input are often shown as if they
252
+ only take input from a file on a filesystem, which was misleading.
253
+ (merge 33e8fc8 jc/usage-stdin later to maint).
254
+
255
+ * "git am -3" had a small regression where it is aborted in its error
256
+ handling codepath when underlying merge-recursive failed in certain
257
+ ways, as it assumed that the internal call to merge-recursive will
258
+ never die, which is not the case (yet).
259
+ (merge c63d4b2 jc/am-3-fallback-regression-fix later to maint).
260
+
261
* Code clean-up and minor fixes.
262
(merge 15ed07d jc/rerere later to maint).
263
(merge e7a7401 pt/pull-builtin later to maint).
@@ -234,3 +268,4 @@ notes for details).
268
(merge ba128e2 es/worktree-add-cleanup later to maint).
269
(merge 44cd91e cc/quote-comments later to maint).
270
(merge 147875f sb/submodule-config-parse later to maint).
271
+ (merge ae9f274 es/worktree-add later to maint).