git, branch v2.37.0-rc2

Git 2.37-rc2

2022-06-22T16:07:56Z

Signed-off-by: Junio C Hamano

Merge branch 'tb/cruft-packs'

2022-06-22T16:06:37Z

Docfix. * tb/cruft-packs: gc: simplify --cruft description

Merge branch 'jp/prompt-clear-before-upstream-mark'

2022-06-21T17:07:50Z

Bash command line prompt (in contrib/) update. * jp/prompt-clear-before-upstream-mark: git-prompt: fix expansion of branch colour codes git-prompt: make colourization consistent

gc: simplify --cruft description

2022-06-21T15:58:04Z

Remove duplicate "loose objects". Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

name-rev: prefix annotate-stdin with '--' in message

2022-06-20T23:20:45Z

This is an option rather than command. Make the message convey this similar to the other messages in the file. Signed-off-by: Alexander Shopov Signed-off-by: Junio C Hamano

Git 2.37-rc1

2022-06-18T00:15:13Z

Signed-off-by: Junio C Hamano

Merge branch 'cb/path-owner-check-with-sudo-plus'

2022-06-18T00:12:31Z

"sudo git foo" used to consider a repository owned by the original user a safe one to access; it now also considers a repository owned by root a safe one, too (after all, if an attacker can craft a malicious repository owned by root, the box is 0wned already). * cb/path-owner-check-with-sudo-plus: git-compat-util: allow root to access both SUDO_UID and root owned

git-compat-util: allow root to access both SUDO_UID and root owned

2022-06-17T21:03:08Z

Previous changes introduced a regression which will prevent root for accessing repositories owned by thyself if using sudo because SUDO_UID takes precedence. Loosen that restriction by allowing root to access repositories owned by both uid by default and without having to add a safe.directory exception. A previous workaround that was documented in the tests is no longer needed so it has been removed together with its specially crafted prerequisite. Helped-by: Johanness Schindelin Signed-off-by: Carlo Marcelo Arenas Belón Signed-off-by: Junio C Hamano

i18n: fix mismatched camelCase config variables

2022-06-17T17:38:26Z

Some config variables are combinations of multiple words, and we typically write them in camelCase forms in manpage and translatable strings. It's not easy to find mismatches for these camelCase config variables during code reviews, but occasionally they are identified during localization translations. To check for mismatched config variables, I introduced a new feature in the helper program for localization[^1]. The following mismatched config variables have been identified by running the helper program, such as "git-po-helper check-pot". Lowercase in manpage should use camelCase: * Documentation/config/http.txt: http.pinnedpubkey Lowercase in translable strings should use camelCase: * builtin/fast-import.c: pack.indexversion * builtin/gc.c: gc.logexpiry * builtin/index-pack.c: pack.indexversion * builtin/pack-objects.c: pack.indexversion * builtin/repack.c: pack.writebitmaps * commit.c: i18n.commitencoding * gpg-interface.c: user.signingkey * http.c: http.postbuffer * submodule-config.c: submodule.fetchjobs Mismatched camelCases, choose the former: * Documentation/config/transfer.txt: transfer.credentialsInUrl remote.c: transfer.credentialsInURL [^1]: https://github.com/git-l10n/git-po-helper Signed-off-by: Jiang Xin Signed-off-by: Junio C Hamano

Another batch of fixes before -rc1

2022-06-17T17:33:42Z

Signed-off-by: Junio C Hamano