The fifth batch post 2.14
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Aug 26, 2017 at 23:00 UTC
238e487ea943f80734cc6dad665e7238b8cbc7ff
1 file changed
+49
-1
Documentation/RelNotes/2.15.0.txt
+49
-1
@@ -48,6 +48,29 @@ UI, Workflows & Features
48
* "git merge" learned a "--signoff" option to add the Signed-off-by:
49
trailer with the committer's name.
50
51
+ * "git diff" learned to optionally paint new lines that are the same
52
+ as deleted lines elsewhere differently from genuinely new lines.
53
+
54
+ * "git interpret-trailers" learned to take the trailer specifications
55
+ from the command line that overrides the configured values.
56
+
57
+ * "git interpret-trailers" has been taught a "--parse" and a few
58
+ other options to make it easier for scripts to grab existing
59
+ trailer lines from a commit log message.
60
+
61
+ * "gitweb" shows a link to visit the 'raw' contents of blbos in the
62
+ history overview page.
63
+
64
+ * "[gc] rerereResolved = 5.days" used to be invalid, as the variable
65
+ is defined to take an integer counting the number of days. It now
66
+ is allowed.
67
+
68
+ * The code to acquire a lock on a reference (e.g. while accepting a
69
+ push from a client) used to immediately fail when the reference is
70
+ already locked---now it waits for a very short while and retries,
71
+ which can make it succeed if the lock holder was holding it during
72
+ a read-only operation.
73
+
74
75
Performance, Internal Implementation, Development Support etc.
76
@@ -97,6 +120,13 @@ Performance, Internal Implementation, Development Support etc.
120
been simplified.
121
(merge 8aade107dd jc/simplify-progress later to maint).
122
123
+ * Code clean-up to avoid mixing values read from the .gitmodules file
124
+ and values read from the .git/config file.
125
+
126
+ * We used to spend more than necessary cycles allocating and freeing
127
+ piece of memory while writing each index entry out. This has been
128
+ optimized.
129
+
130
Also contains various documentation updates and code clean-ups.
131
132
@@ -196,13 +226,28 @@ Fixes since v2.14
226
the offending subprocess was running. This has been corrected.
227
(merge d3ba566342 cc/subprocess-handshake-missing-capabilities later to maint).
228
229
+ * "git apply" that is used as a better "patch -p1" failed to apply a
230
+ taken from a file with CRLF line endings to a file with CRLF line
231
+ endings. The root cause was because it misused convert_to_git()
232
+ that tried to do "safe-crlf" processing by looking at the index
233
+ entry at the same path, which is a nonsense---in that mode, "apply"
234
+ is not working on the data in (or derived from) the index at all.
235
+ This has been fixed.
236
+ (merge c24f3abace tb/apply-with-crlf later to maint).
237
+
238
+ * Killing "git merge --edit" before the editor returns control left
239
+ the repository in a state with MERGE_MSG but without MERGE_HEAD,
240
+ which incorrectly tells the subsequent "git commit" that there was
241
+ a squash merge in progress. This has been fixed.
242
+ (merge 9d89b35526 mg/killed-merge later to maint).
243
+
244
* Other minor doc, test and build updates and code cleanups.
245
(merge dff2813391 ab/ref-filter-no-contains later to maint).
246
(merge f094b89a4d ma/parse-maybe-bool later to maint).
247
(merge 974ce8078c mf/no-dashed-subcommands later to maint).
248
(merge f81935cc4d jc/perl-git-comment-typofix later to maint).
249
(merge 57ea241ef0 rs/t3700-clean-leftover later to maint).
205
- (merge f1068efefe jk/drop-sha1-entry-pos later to maint).
250
+ (merge 39b00fa4d4 jk/drop-sha1-entry-pos later to maint).
251
(merge 0b006014c8 jk/hashcmp-memcmp later to maint).
252
(merge 1e22a9917b rj/add-chmod-error-message later to maint).
253
(merge 881529c846 rs/apply-lose-prefix-length later to maint).
@@ -216,3 +261,6 @@ Fixes since v2.14
261
(merge 794b7e1674 mg/format-ref-doc-fix later to maint).
262
(merge 24da8a26a9 rs/commit-h-single-parent-cleanup later to maint).
263
(merge 4e36907fa3 jk/doc-the-this later to maint).
264
+ (merge 15d1d0951e bc/vcs-svn-cleanup later to maint).
265
+ (merge b8f43b120b jn/vcs-svn-cleanup later to maint).
266
+ (merge 4a4becfb23 jt/doc-pack-objects-fix later to maint).