The sixth batch for 2.18

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed May 23, 2018 at 14:45 UTC e144d126d74f5d2702870ca9423743102eec6fcd
1 file changed +101
Documentation/RelNotes/2.18.0.txt
+101
@@ -82,6 +82,28 @@ UI, Workflows & Features
82 "feature" to fetch only commits and/or trees, which nobody used.
83 This has been removed.
84
85 + * The functionality of "$GIT_DIR/info/grafts" has been superseded by
86 + the "refs/replace/" mechanism for some time now, but the internal
87 + code had support for it in many places, which has been cleaned up
88 + in order to drop support of the "grafts" mechanism.
89 +
90 + * "git worktree add" learned to check out an existing branch.
91 +
92 + * "git --no-pager cmd" did not have short-and-sweet single letter
93 + option. Now it does as "-P".
94 + (merge 7213c28818 js/no-pager-shorthand later to maint).
95 +
96 + * "git rebase" learned "--rebase-merges" to transplant the whole
97 + topology of commit graph elsewhere.
98 +
99 + * "git status" learned to pay attention to UI related diff
100 + configuration variables such as diff.renames.
101 +
102 + * The command line completion mechanism (in contrib/) learned to load
103 + custom completion file for "git $command" where $command is a
104 + custom "git-$command" that the end user has on the $PATH when using
105 + newer version of bash.
106 +
107
108 Performance, Internal Implementation, Development Support etc.
109
@@ -179,6 +201,37 @@ Performance, Internal Implementation, Development Support etc.
201 * The code to interface to GPG has been restructured somewhat to make
202 it cleaner to integrate with other types of signature systems later.
203
204 + * The code has been taught to use the duplicated information stored
205 + in the commit-graph file to learn the tree object name for a commit
206 + to avoid opening and parsing the commit object when it makes sense
207 + to do so.
208 +
209 + * "git gc" in a large repository takes a lot of time as it considers
210 + to repack all objects into one pack by default. The command has
211 + been taught to pretend as if the largest existing packfile is
212 + marked with ".keep" so that it is left untouched while objects in
213 + other packs and loose ones are repacked.
214 +
215 + * The transport protocol v2 is getting updated further.
216 +
217 + * The codepath around object-info API has been taught to take the
218 + repository object (which in turn tells the API which object store
219 + the objects are to be located).
220 +
221 + * Rename detection logic in "diff" family that is used in "merge" has
222 + learned to guess when all of x/a, x/b and x/c have moved to z/a,
223 + z/b and z/c, it is likely that x/d added in the meantime would also
224 + want to move to z/d by taking the hint that the entire directory
225 + 'x' moved to 'z'. A bug causing dirty files involved in a rename
226 + to be overwritten during merge has also been fixed as part of this
227 + work. Incidentally, this also avoids updating a file in the
228 + working tree after a (non-trivial) merge whose result matches what
229 + our side originally had.
230 +
231 + * "git pack-objects" needs to allocate tons of "struct object_entry"
232 + while doing its work, and shrinking its size helps the performance
233 + quite a bit.
234 +
235
236 Also contains various documentation updates and code clean-ups.
237
@@ -292,6 +345,43 @@ Fixes since v2.17
345 some merge commits in certain cases, which has been corrected.
346 (merge be011bbe00 ma/fast-export-skip-merge-fix later to maint).
347
348 + * The code did not propagate the terminal width to subprocesses via
349 + COLUMNS environment variable, which it now does. This caused
350 + trouble to "git column" helper subprocess when "git tag --column=row"
351 + tried to list the existing tags on a display with non-default width.
352 + (merge b5d5a567fb nd/term-columns later to maint).
353 +
354 + * We learned that our source files with ".pl" and ".py" extensions
355 + are Perl and Python files respectively and changes to them are
356 + better viewed as such with appropriate diff drivers.
357 + (merge 7818b619e2 ab/perl-python-attrs later to maint).
358 +
359 + * "git rebase -i" sometimes left intermediate "# This is a
360 + combination of N commits" message meant for the human consumption
361 + inside an editor in the final result in certain corner cases, which
362 + has been fixed.
363 + (merge 15ef69314d js/rebase-i-clean-msg-after-fixup-continue later to maint).
364 +
365 + * A test to see if the filesystem normalizes UTF-8 filename has been
366 + updated to check what we need to know in a more direct way, i.e. a
367 + path created in NFC form can be accessed with NFD form (or vice
368 + versa) to cope with APFS as well as HFS.
369 + (merge 742ae10e35 tb/test-apfs-utf8-normalization later to maint).
370 +
371 + * "git format-patch --cover --attach" created a broken MIME multipart
372 + message for the cover letter, which has been fixed by keeping the
373 + cover letter as plain text file.
374 + (merge 50cd54ef4e bc/format-patch-cover-no-attach later to maint).
375 +
376 + * The split-index feature had a long-standing and dormant bug in
377 + certain use of the in-core merge machinery, which has been fixed.
378 + (merge 7db118303a en/unpack-trees-split-index-fix later to maint).
379 +
380 + * Asciidoctor gives a reasonable imitation for AsciiDoc, but does not
381 + render illustration in a literal block correctly when indented with
382 + HT by default. The problem is fixed by forcing 8-space tabs.
383 + (merge 379805051d bc/asciidoctor-tab-width later to maint).
384 +
385 * Other minor doc, test and build updates and code cleanups.
386 (merge 248f66ed8e nd/trace-with-env later to maint).
387 (merge 14ced5562c ys/bisect-object-id-missing-conversion-fix later to maint).
@@ -310,3 +400,14 @@ Fixes since v2.17
400 (merge adc887221f tq/t1510 later to maint).
401 (merge bed21a8ad6 sg/doc-gc-quote-mismatch-fix later to maint).
402 (merge 73364e4f10 tz/doc-git-urls-reference later to maint).
403 + (merge cd1e606bad bc/mailmap-self later to maint).
404 + (merge f7997e3682 ao/config-api-doc later to maint).
405 + (merge ee930754d8 jk/apply-p-doc later to maint).
406 + (merge 011b648646 nd/pack-format-doc later to maint).
407 + (merge 87a6bb701a sg/t5310-jgit-bitmap-test later to maint).
408 + (merge f6b82970aa sg/t5516-fixes later to maint).
409 + (merge 4362da078e sg/t7005-spaces-in-filenames-cleanup later to maint).
410 + (merge 7d0ee47c11 js/test-unset-prereq later to maint).
411 + (merge 5356a3c354 ah/misc-doc-updates later to maint).
412 + (merge 92c4a7a129 nd/completion-aliasfiletype-typofix later to maint).
413 + (merge 58bd77b66a nd/pack-unreachable-objects-doc later to maint).