git, branch v2.32.0-rc1

Git 2.32-rc1

2021-05-22T09:29:01Z

Signed-off-by: Junio C Hamano

Merge branch 'dl/stash-show-untracked-fixup'

2021-05-22T09:29:01Z

Another brown paper bag inconsistency fix for a new feature introduced during this cycle. * dl/stash-show-untracked-fixup: stash show: use stash.showIncludeUntracked even when diff options given

Merge branch 'jh/simple-ipc-sans-pthread'

2021-05-22T09:29:01Z

The "simple-ipc" did not compile without pthreads support, but the build procedure was not properly account for it. * jh/simple-ipc-sans-pthread: simple-ipc: correct ifdefs when NO_PTHREADS is defined

Merge branch 'wm/rev-parse-path-format-wo-arg'

2021-05-22T09:29:00Z

The "rev-parse" command did not diagnose the lack of argument to "--path-format" option, which was introduced in v2.31 era, which has been corrected. * wm/rev-parse-path-format-wo-arg: rev-parse: fix segfault with missing --path-format argument

stash show: use stash.showIncludeUntracked even when diff options given

2021-05-22T08:56:46Z

If options pertaining to how the diff is displayed is provided to `git stash show`, the command will ignore the stash.showIncludeUntracked configuration variable, defaulting to not showing any untracked files. This is unintuitive behaviour since the format of the diff output and whether or not to display untracked files are orthogonal. Use stash.showIncludeUntracked even when diff options are given. Of course, this is still overridable via the command-line options. Update the documentation to explicitly say which configuration variables will be overridden when a diff options are given. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

simple-ipc: correct ifdefs when NO_PTHREADS is defined

2021-05-20T22:55:00Z

Simple IPC always requires threads (in addition to various platform-specific IPC support). Fix the ifdefs in the Makefile to define SUPPORTS_SIMPLE_IPC when appropriate. Previously, the Unix version of the code would only verify that Unix domain sockets were available. This problem was reported here: https://lore.kernel.org/git/YKN5lXs4AoK%2FJFTO@coredump.intra.peff.net/T/#m08be8f1942ea8a2c36cfee0e51cdf06489fdeafc Reported-by: Randall S. Becker Helped-by: Jeff King Signed-off-by: Jeff Hostetler Signed-off-by: Junio C Hamano

Merge branch 'ds/sparse-index-protections'

2021-05-20T20:50:38Z

Fix access to uninitialized piece of memory, introduced during this cycle. * ds/sparse-index-protections: sparse-index: fix uninitialized jump

Merge branch 'tz/c-locale-output-is-no-more'

2021-05-20T20:50:32Z

Test update. * tz/c-locale-output-is-no-more: t7500: remove non-existant C_LOCALE_OUTPUT prereq

Merge branch 'cs/http-use-basic-after-failed-negotiate'

2021-05-20T20:49:41Z

Regression fix for a change made during this cycle. * cs/http-use-basic-after-failed-negotiate: Revert "remote-curl: fall back to basic auth if Negotiate fails" t5551: test http interaction with credential helpers

A handful more topics before -rc1

2021-05-19T23:55:00Z

Signed-off-by: Junio C Hamano