git, branch v2.23.0-rc1

Git 2.23-rc1

2019-08-02T20:12:24Z

Signed-off-by: Junio C Hamano

Merge branch 'sg/fsck-config-in-doc'

2019-08-02T20:12:03Z

Doc update. * sg/fsck-config-in-doc: Documentation/git-fsck.txt: include fsck.* config variables

Merge branch 'js/visual-studio'

2019-08-02T20:12:02Z

Support building Git with Visual Studio The bits about .git/branches/* have been dropped from the series. We may want to drop the support for it, but until that happens, the tests should rely on the existence of the support to pass. * js/visual-studio: (23 commits) git: avoid calling aliased builtins via their dashed form bin-wrappers: append `.exe` to target paths if necessary .gitignore: ignore Visual Studio's temporary/generated files .gitignore: touch up the entries regarding Visual Studio vcxproj: also link-or-copy builtins msvc: add a Makefile target to pre-generate the Visual Studio solution contrib/buildsystems: add a backend for modern Visual Studio versions contrib/buildsystems: handle options starting with a slash contrib/buildsystems: also handle -lexpat contrib/buildsystems: handle libiconv, too contrib/buildsystems: handle the curl library option contrib/buildsystems: error out on unknown option contrib/buildsystems: optionally capture the dry-run in a file contrib/buildsystems: redirect errors of the dry run into a log file contrib/buildsystems: ignore gettext stuff contrib/buildsystems: handle quoted spaces in filenames contrib/buildsystems: fix misleading error message contrib/buildsystems: ignore irrelevant files in Generators/ contrib/buildsystems: ignore invalidcontinue.obj Vcproj.pm: urlencode '<' and '>' when generating VC projects ...

Merge branch 'jc/log-mailmap-flip-defaults'

2019-08-02T20:12:02Z

Hotfix for making "git log" use the mailmap by default. * jc/log-mailmap-flip-defaults: log: really flip the --mailmap default log: flip the --mailmap default unconditionally

Merge branch 'js/early-config-with-onbranch'

2019-08-02T20:12:02Z

The recently added [includeif "onbranch:branch"] feature does not work well with an early config mechanism, as it attempts to find out what branch we are on before we even haven't located the git repository. The inclusion during early config scan is ignored to work around this issue. * js/early-config-with-onbranch: config: work around bug with includeif:onbranch and early config

log: really flip the --mailmap default

2019-08-02T16:55:03Z

Update the docs, test the interaction between the new default, configuration and command line option, in addition to actually flipping the default. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'jk/repack-silence-auto-bitmap-warning'

2019-08-01T16:10:50Z

Squelch unneeded and misleading warnings from "repack" when the command attempts to generate pack bitmaps without explicitly asked for by the user. * jk/repack-silence-auto-bitmap-warning: repack: simplify handling of auto-bitmaps and .keep files repack: silence warnings when auto-enabled bitmaps cannot be built t7700: clean up .keep file in bitmap-writing test

Merge branch 'jk/sort-iter-test-output'

2019-08-01T16:10:50Z

* jk/sort-iter-test-output: t: sort output of hashmap iteration

Merge branch 'jc/dir-iterator-test-fix'

2019-08-01T16:10:50Z

* jc/dir-iterator-test-fix: test-dir-iterator: do not assume errno values

Merge branch 'bc/hash-independent-tests-part-4'

2019-08-01T16:10:49Z

Update to the tests to help SHA-256 transition continues. * bc/hash-independent-tests-part-4: t2203: avoid hard-coded object ID values t1710: make hash independent t1007: remove SHA1 prerequisites t0090: make test pass with SHA-256 t0027: make hash size independent t6030: make test work with SHA-256 t5000: make hash independent t1450: make hash size independent t1410: make hash size independent t: add helper to convert object IDs to paths