From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Jun 2022 19:36:11 +0000 (-0700)
Subject: Sync with Git 2.36.2
X-Git-Tag: v2.37.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69ab3309e96279b3f323ceb1b8c2ebf670788c8e;p=thirdparty%2Fgit.git

Sync with Git 2.36.2

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

69ab3309e96279b3f323ceb1b8c2ebf670788c8e
diff --cc t/t0033-safe-directory.sh
index 238b25f91a,239d93f4d2..3908597d42
--- a/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
  '
  
 +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 "unsafe repository" 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