git/contrib, branch v2.37.2

Merge branch 'cl/rerere-train-with-no-sign' into maint

2022-08-11T04:52:33Z

"rerere-train" script (in contrib/) used to honor commit.gpgSign while recreating the throw-away merges. source: * cl/rerere-train-with-no-sign: contrib/rerere-train: avoid useless gpg sign in training

Merge branch 'ld/osx-keychain-usage-fix' into maint

2022-08-05T22:51:37Z

Workaround for a compiler warning against use of die() in osx-keychain (in contrib/). source: * ld/osx-keychain-usage-fix: osx-keychain: fix compiler warning

osx-keychain: fix compiler warning

2022-07-19T18:25:15Z

Update git-credential-osxkeychain.c to remove 'format string is not a string literal (potentially insecure)' compiler warning by treating the string as an argument. Signed-off-by: Lessley Dennington Acked-by: Derrick Stolee Signed-off-by: Junio C Hamano

contrib/rerere-train: avoid useless gpg sign in training

2022-07-19T18:24:08Z

Users may have configured "git merge" to always require GPG signing the resulting commits. We are not running "git merge" to re-create merge commits, but merely to replay merge conflicts, and we will immediately discard the resulting commits; there is no point in signing them. Override such configuration that forces useless signing from the command line with the "--no-gpg-sign" option. Signed-off-by: Celeste Liu Signed-off-by: Junio C Hamano

vscode: improve tab size and wrapping

2022-06-27T22:37:44Z

The contrib/vscode/init.sh script initializes the .vscode directory with some helpful metadata so VS Code handles Git code better. One big issue that VS Code has is detecting the tab width based on file type. ".txt" files were not covered by this script before, so add them with the appropriate tab widths. This prevents inserting spaces instead of tabs and keeps the tab width to eight instead of four or two. While we are here, remove the "editor.wordWrap" settings. The editor's word wrap is only cosmetic: it does not actually insert newlines when your typing goes over the column limit. This can make it appear like you have properly wrapped code, but it is incorrect. Further, existing code that is over the column limit is wrapped even if your editor window is wider than the limit. This can make reading such code more difficult. Without these lines, VS Code renders the lines accurately, without "ghost" newlines. Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano

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

Merge branch 'jc/cocci-cleanup'

2022-06-17T17:33:31Z

Remove a coccinelle rule that is no longer relevant. * jc/cocci-cleanup: cocci: retire is_null_sha1() rule

Merge branch 'jh/builtin-fsmonitor-part3'

2022-06-10T22:04:15Z

More fsmonitor--daemon. * jh/builtin-fsmonitor-part3: (30 commits) t7527: improve implicit shutdown testing in fsmonitor--daemon fsmonitor--daemon: allow --super-prefix argument t7527: test Unicode NFC/NFD handling on MacOS t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd t/helper/hexdump: add helper to print hexdump of stdin fsmonitor: on macOS also emit NFC spelling for NFD pathname t7527: test FSMonitor on case insensitive+preserving file system fsmonitor: never set CE_FSMONITOR_VALID on submodules t/perf/p7527: add perf test for builtin FSMonitor t7527: FSMonitor tests for directory moves fsmonitor: optimize processing of directory events fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed fsm-health-win32: force shutdown daemon if worktree root moves fsm-health-win32: add polling framework to monitor daemon health fsmonitor--daemon: stub in health thread fsmonitor--daemon: rename listener thread related variables fsmonitor--daemon: prepare for adding health thread fsmonitor--daemon: cd out of worktree root fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS unpack-trees: initialize fsmonitor_has_run_once in o->result ...

git-prompt: fix expansion of branch colour codes

2022-06-10T16:41:49Z

Because of the wrapping of the branch name variable $b, the colour codes in the variable don't get applied, but are instead printed directly in the output. Move the wrapping of $b to before colour codes are inserted to correct this. Revert move of branch name colour codes in tests, as the branch name is now coloured after the wrapping instead of before. Signed-off-by: Joakim Petersen Signed-off-by: Junio C Hamano

cocci: retire is_null_sha1() rule

2022-06-07T22:53:24Z

Since 8d4d86b0 (cache: remove null_sha1, 2019-08-18) removed the is_null_sha1() function, rewrite rules to correct callers of the function to use is_null_oid() instead has become irrelevant, as any new callers of the function will get caught by the compiler much more quickly without spending cycles on Coccinelle. Remove these rules. Signed-off-by: Junio C Hamano