Seventh batch for 2.19 cycle

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

Junio C Hamano committed Aug 17, 2018 at 13:15 UTC fa03cdc39b951d1cfbfd690fe6f3ac6c57ab6a44
1 file changed +64
Documentation/RelNotes/2.19.0.txt
+64
@@ -65,6 +65,14 @@ UI, Workflows & Features
65 * "git p4 submit" learns to ask its own pre-submit hook if it should
66 continue with submitting.
67
68 + * The test performed at the receiving end of "git push" to prevent
69 + bad objects from entering repository can be customized via
70 + receive.fsck.* configuration variables; we now have gained a
71 + counterpart to do the same on the "git fetch" side, with
72 + fetch.fsck.* configuration variables.
73 +
74 + * "git pull --rebase=interactive" learned "i" as a short-hand for
75 + "interactive".
76
77 Performance, Internal Implementation, Development Support etc.
78
@@ -193,6 +201,25 @@ Performance, Internal Implementation, Development Support etc.
201 failed tests.
202 (merge aea8879a6a sg/travis-retrieve-trash-upon-failure later to maint).
203
204 + * The parse-options machinery learned to refrain from enclosing
205 + placeholder string inside a "<bra" and "ket>" pair automatically
206 + without PARSE_OPT_LITERAL_ARGHELP. Existing help text for option
207 + arguments that are not formatted correctly have been identified and
208 + fixed.
209 + (merge 5f0df44cd7 rs/parse-opt-lithelp later to maint).
210 +
211 + * Noiseword "extern" has been removed from function decls in the
212 + header files.
213 +
214 + * A few atoms like %(objecttype) and %(objectsize) in the format
215 + specifier of "for-each-ref --format=<format>" can be filled without
216 + getting the full contents of the object, but just with the object
217 + header. These cases have been optimized by calling
218 + oid_object_info() API (instead of reading and inspecting the data).
219 +
220 + * The end result of documentation update has been made to be
221 + inspected more easily to help developers.
222 +
223
224 Fixes since v2.18
225 -----------------
@@ -399,6 +426,39 @@ Fixes since v2.18
426 bit (and not materializing the file in the working tree).
427 (merge 2b75fb601c en/merge-recursive-skip-fix later to maint).
428
429 + * The "author-script" file "git rebase -i" creates got broken when
430 + we started to move the command away from shell script, which is
431 + getting fixed now.
432 + (merge 5522bbac20 es/rebase-i-author-script-fix later to maint).
433 +
434 + * The automatic tree-matching in "git merge -s subtree" was broken 5
435 + years ago and nobody has noticed since then, which is now fixed.
436 + (merge 2ec4150713 jk/merge-subtree-heuristics later to maint).
437 +
438 + * "git fetch $there refs/heads/s" ought to fetch the tip of the
439 + branch 's', but when "refs/heads/refs/heads/s", i.e. a branch whose
440 + name is "refs/heads/s" exists at the same time, fetched that one
441 + instead by mistake. This has been corrected to honor the usual
442 + disambiguation rules for abbreviated refnames.
443 + (merge 60650a48c0 jt/refspec-dwim-precedence-fix later to maint).
444 +
445 + * Futureproofing a helper function that can easily be misused.
446 + (merge 65bb21e77e es/want-color-fd-defensive later to maint).
447 +
448 + * The http-backend (used for smart-http transport) used to slurp the
449 + whole input until EOF, without paying attention to CONTENT_LENGTH
450 + that is supplied in the environment and instead expecting the Web
451 + server to close the input stream. This has been fixed.
452 + (merge eebfe40962 mk/http-backend-content-length later to maint).
453 +
454 + * "git merge --abort" etc. did not clean things up properly when
455 + there were conflicted entries in the index in certain order that
456 + are involved in D/F conflicts. This has been corrected.
457 + (merge ad3762042a en/abort-df-conflict-fixes later to maint).
458 +
459 + * "git diff --indent-heuristic" had a bad corner case performance.
460 + (merge 301ef85401 sb/indent-heuristic-optim later to maint).
461 +
462 * Code cleanup, docfix, build fix, etc.
463 (merge aee9be2ebe sg/update-ref-stdin-cleanup later to maint).
464 (merge 037714252f jc/clean-after-sanity-tests later to maint).
@@ -421,3 +481,7 @@ Fixes since v2.18
481 (merge ffbd51cc60 nd/pack-objects-threading-doc later to maint).
482 (merge e9dac7be60 es/mw-to-git-chain-fix later to maint).
483 (merge fe583c6c7a rs/remote-mv-leakfix later to maint).
484 + (merge 69885ab015 en/t3031-title-fix later to maint).
485 + (merge 8578037bed nd/config-blame-sort later to maint).
486 + (merge 8ad169c4ba hn/config-in-code-comment later to maint).
487 + (merge b7446fcfdf ar/t4150-am-scissors-test-fix later to maint).