Sync with Git 2.36.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc setup.c
Simple merge

diff --cc t/t0033-safe-directory.sh
index 238b25f91a34d745016045a9570063086a5eec1f,239d93f4d21141f5991f9fb409a4675ece0f98bd..3908597d42d705161b5b8808e55c8125f8edffe1
--- 1/t/t0033-safe-directory.sh
--- 2/t/t0033-safe-directory.sh
+++ b/t/t0033-safe-directory.sh
@@@ -9,41 -9,13 +9,41 @@@ export GIT_TEST_ASSUME_DIFFERENT_OWNE
  
  expect_rejected_dir () {
        test_must_fail git status 2>err &&
-       grep "unsafe repository" err
 -      grep "safe.directory" err
++      grep "dubious ownership" err
  }
  
  test_expect_success 'safe.directory is not set' '
        expect_rejected_dir
  '
  
-       grep "unsafe repository" err
 +test_expect_success 'ignoring safe.directory on the command line' '
 +      test_must_fail git -c safe.directory="$(pwd)" status 2>err &&
-       grep "unsafe repository" err
++      grep "dubious ownership" err
 +'
 +
 +test_expect_success 'ignoring safe.directory in the environment' '
 +      test_must_fail env GIT_CONFIG_COUNT=1 \
 +              GIT_CONFIG_KEY_0="safe.directory" \
 +              GIT_CONFIG_VALUE_0="$(pwd)" \
 +              git status 2>err &&
-       grep "unsafe repository" err
++      grep "dubious ownership" err
 +'
 +
 +test_expect_success 'ignoring safe.directory in GIT_CONFIG_PARAMETERS' '
 +      test_must_fail env \
 +              GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
 +              git status 2>err &&
++      grep "dubious ownership" err
 +'
 +
 +test_expect_success 'ignoring safe.directory in repo config' '
 +      (
 +              unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
 +              git config safe.directory "$(pwd)"
 +      ) &&
 +      expect_rejected_dir
 +'
 +
  test_expect_success 'safe.directory does not match' '
        git config --global safe.directory bogus &&
        expect_rejected_dir