1Git 2.5 Release Notes 2===================== 3 4Updates since v2.4 5------------------ 6 7UI, Workflows & Features 8 9 * The bash completion script (in contrib/) learned a few options that 10 "git revert" takes. 11 12 * Whitespace breakages in deleted and context lines can also be 13 painted in the output of "git diff" and friends with the new 14 --ws-error-highlight option. 15 16 * List of commands shown by "git help" are grouped along the workflow 17 elements to help early learners. 18 19 * "git p4" now detects the filetype (e.g. binary) correctly even when 20 the files are opened exclusively. 21 22 * git p4 attempts to better handle branches in Perforce. 23 24 * "git p4" learned "--changes-block-size <n>" to read the changes in 25 chunks from Perforce, instead of making one call to "p4 changes" 26 that may trigger "too many rows scanned" error from Perforce. 27 28 * More workaround for Perforce's row number limit in "git p4". 29 30 * Unlike "$EDITOR" and "$GIT_EDITOR" that can hold the path to the 31 command and initial options (e.g. "/path/to/emacs -nw"), 'git p4' 32 did not let the shell interpolate the contents of the environment 33 variable that name the editor "$P4EDITOR" (and "$EDITOR", too). 34 This release makes it in line with the rest of Git, as well as with 35 Perforce. 36 37 * A new short-hand <branch>@{push} denotes the remote-tracking branch 38 that tracks the branch at the remote the <branch> would be pushed 39 to. 40 41 * "git show-branch --topics HEAD" (with no other arguments) did not 42 do anything interesting. Instead, contrast the given revision 43 against all the local branches by default. 44 45 * A replacement for contrib/workdir/git-new-workdir that does not 46 rely on symbolic links and make sharing of objects and refs safer 47 by making the borrowee and borrowers aware of each other. 48 49 Consider this as still an experimental feature; its UI is still 50 likely to change. 51 52 * Tweak the sample "store" backend of the credential helper to honor 53 XDG configuration file locations when specified. 54 55 * A heuristic we use to catch mistyped paths on the command line 56 "git <cmd> <revs> <pathspec>" is to make sure that all the non-rev 57 parameters in the later part of the command line are names of the 58 files in the working tree, but that means "git grep $str -- \*.c" 59 must always be disambiguated with "--", because nobody sane will 60 create a file whose name literally is asterisk-dot-see. Loosen the 61 heuristic to declare that with a wildcard string the user likely 62 meant to give us a pathspec. 63 64 * "git merge FETCH_HEAD" learned that the previous "git fetch" could 65 be to create an Octopus merge, i.e. recording multiple branches 66 that are not marked as "not-for-merge"; this allows us to lose an 67 old style invocation "git merge <msg> HEAD $commits..." in the 68 implementation of "git pull" script; the old style syntax can now 69 be deprecated (but not removed yet). 70 71 * Filter scripts were run with SIGPIPE disabled on the Git side, 72 expecting that they may not read what Git feeds them to filter. 73 We however treated a filter that does not read its input fully 74 before exiting as an error. We no longer do and ignore EPIPE 75 when writing to feed the filter scripts. 76 77 This changes semantics, but arguably in a good way. If a filter 78 can produce its output without fully consuming its input using 79 whatever magic, we now let it do so, instead of diagnosing it 80 as a programming error. 81 82 * Instead of dying immediately upon failing to obtain a lock, the 83 locking (of refs etc) retries after a short while with backoff. 84 85 * Introduce http.<url>.SSLCipherList configuration variable to tweak 86 the list of cipher suite to be used with libcURL when talking with 87 https:// sites. 88 89 * "git subtree" script (in contrib/) used "echo -n" to produce 90 progress messages in a non-portable way. 91 92 * "git subtree" script (in contrib/) does not have --squash option 93 when pushing, but the documentation and help text pretended as if 94 it did. 95 96 * The Git subcommand completion (in contrib/) no longer lists credential 97 helpers among candidates; they are not something the end user would 98 invoke interactively. 99 100 * The index file can be taught with "update-index --untracked-cache" 101 to optionally remember already seen untracked files, in order to 102 speed up "git status" in a working tree with tons of cruft. 103 104 * "git mergetool" learned to drive WinMerge as a backend. 105 106 * "git upload-pack" that serves "git fetch" can be told to serve 107 commits that are not at the tip of any ref, as long as they are 108 reachable from a ref, with uploadpack.allowReachableSHA1InWant 109 configuration variable. 110 111 * "git cat-file --batch(-check)" learned the "--follow-symlinks" 112 option that follows an in-tree symbolic link when asked about an 113 object via extended SHA-1 syntax, e.g. HEAD:RelNotes that points at 114 Documentation/RelNotes/2.5.0.txt. With the new option, the command 115 behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as 116 input instead. 117 118 Consider this as still an experimental and incomplete feature: 119 120 - We may want to do the same for in-index objects, e.g. 121 asking for :RelNotes with this option should give 122 :Documentation/RelNotes/2.5.0.txt, too 123 124 - "git cat-file --follow-symlinks blob HEAD:RelNotes" 125 may also be something we want to allow in the future. 126 127 * "git send-email" learned the alias file format used by the sendmail 128 program (in a simplified form; we obviously do not feed pipes). 129 130 * Traditionally, external low-level 3-way merge drivers are expected 131 to produce their results based solely on the contents of the three 132 variants given in temporary files named by %O, %A and %B on their 133 command line. Additionally allow them to look at the final path 134 (given by %P). 135 136 * "git blame" learned blame.showEmail configuration variable. 137 138 * "git apply" cannot diagnose a patch corruption when the breakage is 139 to mark the length of the hunk shorter than it really is on the 140 hunk header line "@@ -l,k +m,n @@"; one special case it could is 141 when the hunk becomes no-op (e.g. k == n == 2 for two-line context 142 patch output), and it learned to do so in this special case. 143 144 * Add the "--allow-unknown-type" option to "cat-file" to allow 145 inspecting loose objects of an experimental or a broken type. 146 147 * Many long-running operations show progress eye-candy, even when 148 they are later backgrounded. Hide the eye-candy when the process 149 is sent to the background instead. 150 (merge a4fb76c lm/squelch-bg-progress later to maint). 151 152 153Performance, Internal Implementation, Development Support etc. 154 155 * "unsigned char [20]" used throughout the code to represent object 156 names are being converted into a semi-opaque "struct object_id". 157 This effort is expected to interfere with other topics in flight, 158 but hopefully will give us one extra level of abstraction in the 159 end, when completed. 160 161 * for_each_ref() callback functions were taught to name the objects 162 not with "unsigned char sha1[20]" but with "struct object_id". 163 164 * Catch a programmer mistake to feed a pointer not an array to 165 ARRAY_SIZE() macro, by using a couple of GCC extensions. 166 167 * Some error messages in "git config" were emitted without calling 168 the usual error() facility. 169 170 * When "add--interactive" splits a hunk into two overlapping hunks 171 and then let the user choose only one, it sometimes feeds an 172 incorrect patch text to "git apply". Add tests to demonstrate 173 this. 174 175 I have a slight suspicion that this may be $gmane/87202 coming back 176 and biting us (I seem to have said "let's run with this and see 177 what happens" back then). 178 179 * More line-ending tests. 180 181 * An earlier rewrite to use strbuf_getwholeline() instead of fgets(3) 182 to read packed-refs file revealed that the former is unacceptably 183 inefficient. It has been optimized by using getdelim(3) when 184 available. 185 186 * The refs API uses ref_lock struct which had its own "int fd", even 187 though the same file descriptor was in the lock struct it contains. 188 Clean-up the code to lose this redundant field. 189 190 * There was a dead code that used to handle "git pull --tags" and 191 show special-cased error message, which was made irrelevant when 192 the semantics of the option changed back in Git 1.9 days. 193 (merge 19d122b pt/pull-tags-error-diag later to maint). 194 195 * Help us to find broken test script that splits the body part of the 196 test by mistaken use of wrong kind of quotes. 197 (merge d93d5d5 jc/test-prereq-validate later to maint). 198 199 * Developer support to automatically detect broken &&-chain in the 200 test scripts is now turned on by default. 201 (merge 92b269f jk/test-chain-lint later to maint). 202 203 * Error reporting mechanism used in "refs" API has been made more 204 consistent. 205 206 * "git pull" has more test coverage now. 207 208 * "git pull" has become more aware of the options meant for 209 underlying "git fetch" and then learned to use parse-options 210 parser. 211 212 * Clarify in the Makefile a guideline to decide use of USE_NSEC. 213 214Also contains various documentation updates and code clean-ups. 215 216 217Fixes since v2.4 218---------------- 219 220Unless otherwise noted, all the fixes since v2.4 in the maintenance 221track are contained in this release (see the maintenance releases' 222notes for details). 223 224 * Git 2.4 broke setting verbosity and progress levels on "git clone" 225 with native transports. 226 (merge 822f0c4 mh/clone-verbosity-fix later to maint). 227 228 * "git add -e" did not allow the user to abort the operation by 229 killing the editor. 230 (merge cb64800 jk/add-e-kill-editor later to maint). 231 232 * Memory usage of "git index-pack" has been trimmed by tens of 233 per-cent. 234 (merge f0e7f11 nd/slim-index-pack-memory-usage later to maint). 235 236 * "git rev-list --objects $old --not --all" to see if everything that 237 is reachable from $old is already connected to the existing refs 238 was very inefficient. 239 (merge b6e8a3b jk/still-interesting later to maint). 240 241 * "hash-object --literally" introduced in v2.2 was not prepared to 242 take a really long object type name. 243 (merge 1427a7f jc/hash-object later to maint). 244 245 * "git rebase --quiet" was not quite quiet when there is nothing to 246 do. 247 (merge 22946a9 jk/rebase-quiet-noop later to maint). 248 249 * The completion for "log --decorate=" parameter value was incorrect. 250 (merge af16bda sg/complete-decorate-full-not-long later to maint). 251 252 * "filter-branch" corrupted commit log message that ends with an 253 incomplete line on platforms with some "sed" implementations that 254 munge such a line. Work it around by avoiding to use "sed". 255 (merge df06201 jk/filter-branch-use-of-sed-on-incomplete-line later to maint). 256 257 * "git daemon" fails to build from the source under NO_IPV6 258 configuration (regression in 2.4). 259 (merge d358f77 jc/daemon-no-ipv6-for-2.4.1 later to maint). 260 261 * Some time ago, "git blame" (incorrectly) lost the convert_to_git() 262 call when synthesizing a fake "tip" commit that represents the 263 state in the working tree, which broke folks who record the history 264 with LF line ending to make their project portable across platforms 265 while terminating lines in their working tree files with CRLF for 266 their platform. 267 (merge 4bf256d tb/blame-resurrect-convert-to-git later to maint). 268 269 * We avoid setting core.worktree when the repository location is the 270 ".git" directory directly at the top level of the working tree, but 271 the code misdetected the case in which the working tree is at the 272 root level of the filesystem (which arguably is a silly thing to 273 do, but still valid). 274 (merge 84ccad8 jk/init-core-worktree-at-root later to maint). 275 276 * "git commit --date=now" or anything that relies on approxidate lost 277 the daylight-saving-time offset. 278 (merge f6e6362 jc/epochtime-wo-tz later to maint). 279 280 * Access to objects in repositories that borrow from another one on a 281 slow NFS server unnecessarily got more expensive due to recent code 282 becoming more cautious in a naive way not to lose objects to pruning. 283 (merge ee1c6c3 jk/prune-mtime later to maint). 284 285 * The codepaths that read .gitignore and .gitattributes files have been 286 taught that these files encoded in UTF-8 may have UTF-8 BOM marker at 287 the beginning; this makes it in line with what we do for configuration 288 files already. 289 (merge 27547e5 cn/bom-in-gitignore later to maint). 290 291 * a few helper scripts in the test suite did not report errors 292 correctly. 293 (merge de248e9 ep/fix-test-lib-functions-report later to maint). 294 295 * The default $HOME/.gitconfig file created upon "git config --global" 296 that edits it had incorrectly spelled user.name and user.email 297 entries in it. 298 (merge 7e11052 oh/fix-config-default-user-name-section later to maint). 299 300 * "git cat-file bl $blob" failed to barf even though there is no 301 object type that is "bl". 302 (merge b7994af jk/type-from-string-gently later to maint). 303 304 * The usual "git diff" when seeing a file turning into a directory 305 showed a patchset to remove the file and create all files in the 306 directory, but "git diff --no-index" simply refused to work. Also, 307 when asked to compare a file and a directory, imitate POSIX "diff" 308 and compare the file with the file with the same name in the 309 directory, instead of refusing to run. 310 (merge 0615173 jc/diff-no-index-d-f later to maint). 311 312 * "git rebase -i" moved the "current" command from "todo" to "done" a 313 bit too prematurely, losing a step when a "pick" did not even start. 314 (merge 8cbc57c ph/rebase-i-redo later to maint). 315 316 * The connection initiation code for "ssh" transport tried to absorb 317 differences between the stock "ssh" and Putty-supplied "plink" and 318 its derivatives, but the logic to tell that we are using "plink" 319 variants were too loose and falsely triggered when "plink" appeared 320 anywhere in the path (e.g. "/home/me/bin/uplink/ssh"). 321 (merge baaf233 bc/connect-plink later to maint). 322 323 * We have prepended $GIT_EXEC_PATH and the path "git" is installed in 324 (typically "/usr/bin") to $PATH when invoking subprograms and hooks 325 for almost eternity, but the original use case the latter tried to 326 support was semi-bogus (i.e. install git to /opt/foo/git and run it 327 without having /opt/foo on $PATH), and more importantly it has 328 become less and less relevant as Git grew more mainstream (i.e. the 329 users would _want_ to have it on their $PATH). Stop prepending the 330 path in which "git" is installed to users' $PATH, as that would 331 interfere the command search order people depend on (e.g. they may 332 not like versions of programs that are unrelated to Git in /usr/bin 333 and want to override them by having different ones in /usr/local/bin 334 and have the latter directory earlier in their $PATH). 335 (merge a0b4507 jk/git-no-more-argv0-path-munging later to maint). 336 337 * core.excludesfile (defaulting to $XDG_HOME/git/ignore) is supposed 338 to be overridden by repository-specific .git/info/exclude file, but 339 the order was swapped from the beginning. This belatedly fixes it. 340 (merge 099d2d8 jc/gitignore-precedence later to maint). 341 342 * There was a commented-out (instead of being marked to expect 343 failure) test that documented a breakage that was fixed since the 344 test was written; turn it into a proper test. 345 (merge 66d2e04 sb/t1020-cleanup later to maint). 346 347 * The "log --decorate" enhancement in Git 2.4 that shows the commit 348 at the tip of the current branch e.g. "HEAD -> master", did not 349 work with --decorate=full. 350 (merge 429ad20 mg/log-decorate-HEAD later to maint). 351 352 * The ref API did not handle cases where 'refs/heads/xyzzy/frotz' is 353 removed at the same time as 'refs/heads/xyzzy' is added (or vice 354 versa) very well. 355 (merge c628edf mh/ref-directory-file later to maint). 356 357 * Multi-ref transaction support we merged a few releases ago 358 unnecessarily kept many file descriptors open, risking to fail with 359 resource exhaustion. This is for 2.4.x track. 360 (merge 185ce3a mh/write-refs-sooner-2.4 later to maint). 361 362 * "git bundle verify" did not diagnose extra parameters on the 363 command line. 364 (merge 7886cfa ps/bundle-verify-arg later to maint). 365 366 * Various documentation mark-up fixes to make the output more 367 consistent in general and also make AsciiDoctor (an alternative 368 formatter) happier. 369 (merge d0258b9 jk/asciidoc-markup-fix later to maint). 370 (merge ad3967a jk/stripspace-asciidoctor-fix later to maint). 371 (merge 975e382 ja/tutorial-asciidoctor-fix later to maint). 372 373 * The code to read pack-bitmap wanted to allocate a few hundred 374 pointers to a structure, but by mistake allocated and leaked memory 375 enough to hold that many actual structures. Correct the allocation 376 size and also have it on stack, as it is small enough. 377 (merge 599dc76 rs/plug-leak-in-pack-bitmaps later to maint). 378 379 * The pull.ff configuration was supposed to override the merge.ff 380 configuration, but it didn't. 381 (merge db9bb28 pt/pull-ff-vs-merge-ff later to maint). 382 383 * "git pull --log" and "git pull --no-log" worked as expected, but 384 "git pull --log=20" did not. 385 (merge 5061a44 pt/pull-log-n later to maint). 386 387 * "git rerere forget" in a repository without rerere enabled gave a 388 cryptic error message; it should be a silent no-op instead. 389 (merge 0544574 jk/rerere-forget-check-enabled later to maint). 390 391 * "git rebase -i" fired post-rewrite hook when it shouldn't (namely, 392 when it was told to stop sequencing with 'exec' insn). 393 (merge 141ff8f mm/rebase-i-post-rewrite-exec later to maint). 394 395 * Clarify that "log --raw" and "log --format=raw" are unrelated 396 concepts. 397 (merge 92de921 mm/log-format-raw-doc later to maint). 398 399 * Make "git stash something --help" error out, so that users can 400 safely say "git stash drop --help". 401 (merge 5ba2831 jk/stash-options later to maint). 402 403 * The clean/smudge interface did not work well when filtering an 404 empty contents (failed and then passed the empty input through). 405 It can be argued that a filter that produces anything but empty for 406 an empty input is nonsense, but if the user wants to do strange 407 things, then why not? 408 (merge f6a1e1e jh/filter-empty-contents later to maint). 409 410 * Communication between the HTTP server and http_backend process can 411 lead to a dead-lock when relaying a large ref negotiation request. 412 Diagnose the situation better, and mitigate it by reading such a 413 request first into core (to a reasonable limit). 414 (merge 636614f jk/http-backend-deadlock later to maint). 415 416 * "git clean pathspec..." tried to lstat(2) and complain even for 417 paths outside the given pathspec. 418 (merge 838d6a9 dt/clean-pathspec-filter-then-lstat later to maint). 419 420 * Recent "git prune" traverses young unreachable objects to safekeep 421 old objects in the reachability chain from them, which sometimes 422 caused error messages that are unnecessarily alarming. 423 (merge ce4e7b2 jk/squelch-missing-link-warning-for-unreachable later to maint). 424 425 * The configuration reader/writer uses mmap(2) interface to access 426 the files; when we find a directory, it barfed with "Out of memory?". 427 (merge 9ca0aaf jk/diagnose-config-mmap-failure later to maint). 428 429 * "color.diff.plain" was a misnomer; give it 'color.diff.context' as 430 a more logical synonym. 431 (merge 8dbf3eb jk/color-diff-plain-is-context later to maint). 432 433 * The setup code used to die when core.bare and core.worktree are set 434 inconsistently, even for commands that do not need working tree. 435 (merge fada767 jk/die-on-bogus-worktree-late later to maint). 436 437 * Recent Mac OS X updates breaks the logic to detect that the machine 438 is on the AC power in the sample pre-auto-gc script. 439 (merge c54c7b3 pa/auto-gc-mac-osx later to maint). 440 441 * "git commit --cleanup=scissors" was not careful enough to protect 442 against getting fooled by a line that looked like scissors. 443 (merge fbfa097 sg/commit-cleanup-scissors later to maint). 444 445 * "Have we lost a race with competing repack?" check was too 446 expensive, especially while receiving a huge object transfer 447 that runs index-pack (e.g. "clone" or "fetch"). 448 (merge 0eeb077 jk/index-pack-reduce-recheck later to maint). 449 450 * The tcsh completion writes a bash scriptlet but that would have 451 failed for users with noclobber set. 452 (merge 0b1f688 af/tcsh-completion-noclobber later to maint). 453 454 * "git for-each-ref" reported "missing object" for 0{40} when it 455 encounters a broken ref. The lack of object whose name is 0{40} is 456 not the problem; the ref being broken is. 457 (merge 501cf47 mh/reporting-broken-refs-from-for-each-ref later to maint). 458 459 * Various fixes around "git am" that applies a patch to a history 460 that is not there yet. 461 (merge 6ea3b67 pt/am-abort-fix later to maint). 462 463 * "git fsck" used to ignore missing or invalid objects recorded in reflog. 464 (merge 19bf6c9 mh/fsck-reflog-entries later to maint). 465 466 * "git format-patch --ignore-if-upstream A..B" did not like to be fed 467 tags as boundary commits. 468 (merge 9b7a61d jc/do-not-feed-tags-to-clear-commit-marks later to maint). 469 470 * "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued 471 a shallow transfer request even to an upload-pack that does not 472 support the capability. 473 (merge eb86a50 me/fetch-into-shallow-safety later to maint). 474 475 * "git rebase" did not exit with failure when format-patch it invoked 476 failed for whatever reason. 477 (merge 60d708b cb/rebase-am-exit-code later to maint). 478 479 * Fix a small bug in our use of umask() return value. 480 (merge 3096b2e jk/fix-refresh-utime later to maint). 481 482 * An ancient test framework enhancement to allow color was not 483 entirely correct; this makes it work even when tput needs to read 484 from the ~/.terminfo under the user's real HOME directory. 485 (merge d5c1b7c rh/test-color-avoid-terminfo-in-original-home later to maint). 486 487 * A minor bugfix when pack bitmap is used with "rev-list --count". 488 (merge c8a70d3 jk/rev-list-no-bitmap-while-pruning later to maint). 489 490 * "git config" failed to update the configuration file when the 491 underlying filesystem is incapable of renaming a file that is still 492 open. 493 (merge 7a64592 kb/config-unmap-before-renaming later to maint). 494 495 * Avoid possible ssize_t to int truncation. 496 (merge 6c8afe4 mh/strbuf-read-file-returns-ssize-t later to maint). 497 498 * When you say "!<ENTER>" while running say "git log", you'd confuse 499 yourself in the resulting shell, that may look as if you took 500 control back to the original shell you spawned "git log" from but 501 that isn't what is happening. To that new shell, we leaked 502 GIT_PAGER_IN_USE environment variable that was meant as a local 503 communication between the original "Git" and subprocesses that was 504 spawned by it after we launched the pager, which caused many 505 "interesting" things to happen, e.g. "git diff | cat" still paints 506 its output in color by default. 507 508 Stop leaking that environment variable to the pager's half of the 509 fork; we only need it on "Git" side when we spawn the pager. 510 (merge 124b519 jc/unexport-git-pager-in-use-in-pager later to maint). 511 512 * Abandoning an already applied change in "git rebase -i" with 513 "--continue" left CHERRY_PICK_HEAD and confused later steps. 514 (merge 0e0aff4 js/rebase-i-clean-up-upon-continue-to-skip later to maint). 515 516 * We used to ask libCURL to use the most secure authentication method 517 available when talking to an HTTP proxy only when we were told to 518 talk to one via configuration variables. We now ask libCURL to 519 always use the most secure authentication method, because the user 520 can tell libCURL to use an HTTP proxy via an environment variable 521 without using configuration variables. 522 (merge 5841520 et/http-proxyauth later to maint). 523 524 * A fix to a minor regression to "git fsck" in v2.2 era that started 525 complaining about a body-less tag object when it lacks a separator 526 empty line after its header to separate it with a non-existent body. 527 (merge 84d18c0 jc/fsck-retire-require-eoh later to maint). 528 529 * Code cleanups and documentation updates. 530 (merge 0269f96 mm/usage-log-l-can-take-regex later to maint). 531 (merge 64f2589 nd/t1509-chroot-test later to maint). 532 (merge d201a1e sb/test-bitmap-free-at-end later to maint). 533 (merge 05bfc7d sb/line-log-plug-pairdiff-leak later to maint). 534 (merge 846e5df pt/xdg-config-path later to maint). 535 (merge 1154aa4 jc/plug-fmt-merge-msg-leak later to maint). 536 (merge 319b678 jk/sha1-file-reduce-useless-warnings later to maint). 537 (merge 9a35c14 fg/document-commit-message-stripping later to maint). 538 (merge bbf431c ps/doc-packfile-vs-pack-file later to maint). 539 (merge 309a9e3 jk/skip-http-tests-under-no-curl later to maint). 540 (merge ccd593c dl/branch-error-message later to maint). 541 (merge 22570b6 rs/janitorial later to maint). 542 (merge 5c2a581 mc/commit-doc-grammofix later to maint). 543 (merge ce41720 ah/usage-strings later to maint). 544 (merge e6a268c sb/glossary-submodule later to maint). 545 (merge ec48a76 sb/submodule-doc-intro later to maint). 546 (merge 14f8b9b jk/clone-dissociate later to maint). 547 (merge 055c7e9 sb/pack-protocol-mention-smart-http later to maint). 548 (merge 7c37a5d jk/make-fix-dependencies later to maint). 549 (merge fc0aa39 sg/merge-summary-config later to maint). 550 (merge 329af6c pt/t0302-needs-sanity later to maint). 551 (merge d614f07 fk/doc-format-patch-vn later to maint). 552 (merge 72dbb36 sg/completion-commit-cleanup later to maint). 553 (merge e654eb2 es/utf8-stupid-compiler-workaround later to maint). 554 (merge 34b935c es/osx-header-pollutes-mask-macro later to maint). 555 (merge ab7fade jc/prompt-document-ps1-state-separator later to maint). 556 (merge 25f600e mm/describe-doc later to maint). 557 (merge 83fe167 mm/branch-doc-updates later to maint). 558 (merge 75d2e5a ls/hint-rev-list-count later to maint). 559 (merge edc8f71 cb/subtree-tests-update later to maint). 560 (merge 5330e6e sb/p5310-and-chain later to maint). 561 (merge c4ac525 tb/checkout-doc later to maint). 562 (merge e479c5f jk/pretty-encoding-doc later to maint). 563 (merge 7e837c6 ss/clone-guess-dir-name-simplify later to maint).