git, branch v2.36.0-rc1

Git 2.36-rc1

2022-04-08T20:54:49Z

Signed-off-by: Junio C Hamano

Merge branch 'ld/sparse-index-bash-completion'

2022-04-08T20:53:48Z

Test regression fix. * ld/sparse-index-bash-completion: t9902: split test to run on appropriate systems

Merge branch 'tl/ls-tree-oid-only'

2022-04-08T20:53:48Z

Docfix. * tl/ls-tree-oid-only: ls-tree doc: document interaction with submodules

t9902: split test to run on appropriate systems

2022-04-08T19:56:31Z

The "FUNNYNAMES" test prerequisite passes on Cygwin, as the Cygwin file system interface has a workaround for the underlying operating system's lack of support for tabs, newlines or quotes. However, it does not add support for backslash, which is treated as a directory separator, meaning one of the tests added by 48803821b1 ("completion: handle unusual characters for sparse-checkout", 2022-02-07) will fail on Cygwin. To avoid this failure while still getting maximal test coverage, split that test into two: test handling of paths that include tabs on anything that has the FUNNYNAMES prerequisite, but skip testing handling of paths that include backslashes unless both FUNNYNAMES is set and the system is not Cygwin. It might be nice to have more granularity than "FUNNYNAMES" and its sibling "FUNNIERNAMES" provide, so that tests could be run based on specific individual characters supported by the file system being tested, but that seems like it would make the prerequisite checks in this area much more verbose for very little gain. Signed-off-by: Adam Dinwoodie Signed-off-by: Junio C Hamano

ls-tree doc: document interaction with submodules

2022-04-08T18:21:11Z

The ls-tree documentation had never been updated after it learned to interact with submodules to explicitly mention them. The initial support was added in f35a6d3bce7 (Teach core object handling functions about gitlinks, 2007-04-09). E.g. the discussion of --long added in f35a6d3bce7 (Teach core object handling functions about gitlinks, 2007-04-09) didn't explicitly mention them. But this documentation added in 455923e0a15 (ls-tree: introduce "--format" option, 2022-03-23) had no such excuse, and was actively misleading by providing an exhaustive but incomplete list of object types we'd emit. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Merge branch 'jc/cat-file-batch-commands'

2022-04-07T22:04:19Z

Doc fix. * jc/cat-file-batch-commands: Documentation: add --batch-command to cat-file synopsis

Documentation: add --batch-command to cat-file synopsis

2022-04-07T20:31:54Z

440c705ea63 (cat-file: add --batch-command mode, 2022-02-18) added the new option and operating mode without listing it to the synopsis section. Fix it. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Merge branch 'tz/doc-litdd-fixes'

2022-04-07T19:23:47Z

Documentation markup fix. * tz/doc-litdd-fixes: doc: replace "--" with {litdd} in credential-cache/fsmonitor

Merge branch 'js/apply-partial-clone-filters-recursively'

2022-04-07T19:23:31Z

Typofix * js/apply-partial-clone-filters-recursively: submodule-helper: fix usage string

Merge branch 'tl/ls-tree-oid-only'

2022-04-07T19:23:23Z

* tl/ls-tree-oid-only: git-ls-tree.txt: fix the name of "%(objectsize:padded)"