Fourth batch after 2.12

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

Junio C Hamano committed Mar 14, 2017 at 15:29 UTC 4a9b9b32d47212e4ea43cd1fa3c11afef6d4c491
1 file changed +42
Documentation/RelNotes/2.13.0.txt
+42
@@ -140,6 +140,20 @@ Performance, Internal Implementation, Development Support etc.
140 routines, so let them.
141 (merge 2cfc70f0de jh/mingw-openssl-sha1 later to maint).
142
143 + * The t/perf performance test suite was not prepared to test not so
144 + old versions of Git, but now it covers versions of Git that are not
145 + so ancient.
146 + (merge 28e1fb5466 jt/perf-updates later to maint).
147 +
148 + * Add 32-bit Linux variant to the set of platforms to be tested with
149 + Travis CI.
150 + (merge 88dedd5e72 js/travis-32bit-linux later to maint).
151 +
152 + * "git branch --list" takes the "--abbrev" and "--no-abbrev" options
153 + to control the output of the object name in its "-v"(erbose)
154 + output, but a recent update started ignoring them; fix it before
155 + the breakage reaches to any released version.
156 +
157
158 Also contains various documentation updates and code clean-ups.
159
@@ -247,6 +261,34 @@ notes for details).
261 conversion).
262 (merge 12426e114b jc/diff-populate-filespec-size-only-fix later to maint).
263
264 + * A few tests were run conditionally under (rare) conditions where
265 + they cannot be run (like running cvs tests under 'root' account).
266 + (merge c6507484a2 ab/cond-skip-tests later to maint).
267 +
268 + * "git branch @" created refs/heads/@ as a branch, and in general the
269 + code that handled @{-1} and @{upstream} was a bit too loose in
270 + disambiguating.
271 + (merge fd4692ff70 jk/interpret-branch-name later to maint).
272 +
273 + * "git fetch" that requests a commit by object name, when the other
274 + side does not allow such an request, failed without much
275 + explanation.
276 + (merge d56583ded6 mm/fetch-show-error-message-on-unadvertised-object later to maint).
277 +
278 + * "git filter-branch --prune-empty" drops a single-parent commit that
279 + becomes a no-op, but did not drop a root commit whose tree is empty.
280 + (merge 32da7467eb dp/filter-branch-prune-empty later to maint).
281 +
282 + * Recent versions of Git treats http alternates (used in dumb http
283 + transport) just like HTTP redirects and requires the client to
284 + enable following it, due to security concerns. But we forgot to
285 + give a warning when we decide not to honor the alternates.
286 + (merge 5cae73d5d2 ew/http-alternates-as-redirects-warning later to maint).
287 +
288 + * "git push" had a handful of codepaths that could lead to a deadlock
289 + when unexpected error happened, which has been fixed.
290 + (merge d1a13d3fcb jk/push-deadlock-regression-fix later to maint).
291 +
292 * Other minor doc, test and build updates and code cleanups.
293 (merge 2cfa83574c mm/two-more-xstrfmt later to maint).
294 (merge b803ae4427 ps/docs-diffcore later to maint).