Seventh batch for 2.11
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 3, 2016 at 13:32 UTC
30d687dfd5776aa2149a4a0038cce0ddf552da65
1 file changed
+40
Documentation/RelNotes/2.11.0.txt
+40
@@ -59,6 +59,14 @@ UI, Workflows & Features
59
put the header line back into a single logical line. The
60
underlying "git mailinfo" was taught to handle this properly.
61
62
+ * "gitweb" can spawn "highlight" to show blob contents with
63
+ (programming) language-specific syntax highlighting, but only
64
+ when the language is known. "highlight" can however be told
65
+ to make the guess itself by giving it "--force" option, which
66
+ has been enabled.
67
+
68
+ * "git gui" l10n to Portuguese.
69
+
70
71
Performance, Internal Implementation, Development Support etc.
72
@@ -103,6 +111,9 @@ Performance, Internal Implementation, Development Support etc.
111
existing pack bitmap; now they are and as the result they have
112
become faster.
113
114
+ * The codepath in "git fsck" to detect malformed tree objects has
115
+ been updated not to die but keep going after detecting them.
116
+
117
118
Also contains various documentation updates and code clean-ups.
119
@@ -289,6 +300,33 @@ notes for details).
300
default set of configuration variables to correct this.
301
(merge d49028e6e7 jc/worktree-config later to maint).
302
303
+ * "git init" tried to record core.worktree in the repository's
304
+ 'config' file when GIT_WORK_TREE environment variable was set and
305
+ it was different from where GIT_DIR appears as ".git" at its top,
306
+ but the logic was faulty when .git is a "gitdir:" file that points
307
+ at the real place, causing trouble in working trees that are
308
+ managed by "git worktree". This has been corrected.
309
+
310
+ * Codepaths that read from an on-disk loose object were too loose in
311
+ validating what they are reading is a proper object file and
312
+ sometimes read past the data they read from the disk, which has
313
+ been corrected. H/t to Gustavo Grieco for reporting.
314
+ (merge d21f842690 jc/verify-loose-object-header later to maint).
315
+
316
+ * The original command line syntax for "git merge", which was "git
317
+ merge <msg> HEAD <parent>...", has been deprecated for quite some
318
+ time, and "git gui" was the last in-tree user of the syntax. This
319
+ is finally fixed, so that we can move forward with the deprecation.
320
+ (merge ff65e796f0 rs/git-gui-use-modern-git-merge-syntax later to maint).
321
+
322
+ * An author name, that spelled a backslash-quoted double quote in the
323
+ human readable part "My \"double quoted\" name", was not unquoted
324
+ correctly while applying a patch from a piece of e-mail.
325
+ (merge f357e5de31 kd/mailinfo-quoted-string later to maint).
326
+
327
+ * Doc update to clarify what "log -3 --reverse" does.
328
+ (merge 04be69478f pb/rev-list-reverse-with-count later to maint).
329
+
330
* Other minor doc, test and build updates and code cleanups.
331
(merge e78d57e bw/pathspec-remove-unused-extern-decl later to maint).
332
(merge ce25e4c rs/checkout-some-states-are-const later to maint).
@@ -296,3 +334,5 @@ notes for details).
334
(merge b56aa5b rs/unpack-trees-reduce-file-scope-global later to maint).
335
(merge 5efc60c mr/vcs-svn-printf-ulong later to maint).
336
(merge a22ae75 rs/cocci later to maint).
337
+ (merge 45ccef87b3 rs/copy-array later to maint).
338
+ (merge 8201688ecd dt/mailinfo later to maint).