git, branch v2.27.0-rc2

Git 2.27-rc2

2020-05-26T16:38:13Z

Signed-off-by: Junio C Hamano

Merge branch 'ss/faq-ignore'

2020-05-26T16:32:08Z

Doc markup fix. * ss/faq-ignore: gitfaq: avoid validation error with older asciidoc

gitfaq: avoid validation error with older asciidoc

2020-05-25T18:59:26Z

When building with asciidoc-8.4.5 (as found on CentOS/Red Hat 6), the period in the "[[files-in-.gitignore-are-tracked]]" anchor is not properly parsed as a section: WARNING: gitfaq.txt: line 245: missing [[files-in-.gitignore-are-tracked]] section The resulting XML file fails to validate with xmlto: xmlto: /git/Documentation/gitfaq.xml does not validate (status 3) xmlto: Fix document syntax or use --skip-validation option /git/Documentation/gitfaq.xml:3: element refentry: validity error : Element refentry content does not follow the DTD, expecting (beginpage? , indexterm* , refentryinfo? , refmeta? , (remark | link | olink | ulink)* , refnamediv+ , refsynopsisdiv? , (refsect1+ | refsection+)), got (refmeta refnamediv refsynopsisdiv refsect1 refsect1 refsect1 refsect1 variablelist refsect1 refsect1 ) Document /git/Documentation/gitfaq.xml does not validate Let's avoid breaking users of platforms which ship an old version of asciidoc, since the cost to do so is quite low. Reported-by: Son Luong Ngoc Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

Hopefully final batch before 2.27-rc2

2020-05-25T02:39:40Z

Signed-off-by: Junio C Hamano

Merge branch 'dd/t5703-grep-a-fix'

2020-05-25T02:39:40Z

Update an unconditional use of "grep -a" with a perl script in a test. * dd/t5703-grep-a-fix: t5703: replace "grep -a" usage by perl

Merge branch 'ds/multi-pack-verify'

2020-05-25T02:39:39Z

Fix for a copy-and-paste error introduced during 2.20 era. * ds/multi-pack-verify: fsck: use ERROR_MULTI_PACK_INDEX

Merge branch 'ma/doc-fixes'

2020-05-25T02:39:38Z

Various doc fixes. * ma/doc-fixes: git-sparse-checkout.txt: add missing ' git-credential.txt: use list continuation git-commit-graph.txt: fix list rendering git-commit-graph.txt: fix grammo date-formats.txt: fix list continuation

Merge branch 'cb/bisect-replay-with-dos-fix'

2020-05-25T02:39:38Z

Re-fix longstanding "edited bisect log may confuse bisect replay with trailing carriage-return" issue. * cb/bisect-replay-with-dos-fix: bisect: avoid tailing CR characters from revision in replay

Merge branch 'gs/commit-graph-path-filter'

2020-05-25T02:39:38Z

Test fix. * gs/commit-graph-path-filter: t4216: avoid unnecessary subshell in test_bloom_filters_not_used

Merge branch 'dl/merge-autostash'

2020-05-25T02:39:37Z

Test fix. * dl/merge-autostash: t5520: avoid alternation in grep's BRE (not POSIX)