From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:44 +0000 (-0700)
Subject: Merge branch 'js/t0001-case-insensitive'
X-Git-Tag: v2.23.0-rc0~61
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bf8126fff9cdab2583f1c8b274c0d29ebd000c26?ds=inline;hp=-c

Merge branch 'js/t0001-case-insensitive'

Test update.

* js/t0001-case-insensitive:
t0001: fix on case-insensitive filesystems
---

bf8126fff9cdab2583f1c8b274c0d29ebd000c26
diff --combined t/t0001-init.sh
index 0276d14a0b,88602be0f5..77c5ed6a18
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@@ -175,7 -175,7 +175,7 @@@ test_expect_success 'reinit' 
  test_expect_success 'init with --template' '
  	mkdir template-source &&
  	echo content >template-source/file &&
 -	git init --template=../template-source template-custom &&
 +	git init --template=template-source template-custom &&
  	test_cmp template-source/file template-custom/.git/file
  '
  
@@@ -311,8 -311,8 +311,8 @@@ test_expect_success 'init prefers comma
  test_expect_success 'init with separate gitdir' '
  	rm -rf newdir &&
  	git init --separate-git-dir realgitdir newdir &&
- 	echo "gitdir: $(pwd)/realgitdir" >expected &&
- 	test_cmp expected newdir/.git &&
+ 	newdir_git="$(cat newdir/.git)" &&
+ 	test_cmp_fspath "$(pwd)/realgitdir" "${newdir_git#gitdir: }" &&
  	test_path_is_dir realgitdir/refs
  '
  
@@@ -361,12 -361,9 +361,9 @@@ test_expect_success 're-init on .git fi
  '
  
  test_expect_success 're-init to update git link' '
- 	(
- 	cd newdir &&
- 	git init --separate-git-dir ../surrealgitdir
- 	) &&
- 	echo "gitdir: $(pwd)/surrealgitdir" >expected &&
- 	test_cmp expected newdir/.git &&
+ 	git -C newdir init --separate-git-dir ../surrealgitdir &&
+ 	newdir_git="$(cat newdir/.git)" &&
+ 	test_cmp_fspath "$(pwd)/surrealgitdir" "${newdir_git#gitdir: }" &&
  	test_path_is_dir surrealgitdir/refs &&
  	test_path_is_missing realgitdir/refs
  '
@@@ -374,12 -371,9 +371,9 @@@
  test_expect_success 're-init to move gitdir' '
  	rm -rf newdir realgitdir surrealgitdir &&
  	git init newdir &&
- 	(
- 	cd newdir &&
- 	git init --separate-git-dir ../realgitdir
- 	) &&
- 	echo "gitdir: $(pwd)/realgitdir" >expected &&
- 	test_cmp expected newdir/.git &&
+ 	git -C newdir init --separate-git-dir ../realgitdir &&
+ 	newdir_git="$(cat newdir/.git)" &&
+ 	test_cmp_fspath "$(pwd)/realgitdir" "${newdir_git#gitdir: }" &&
  	test_path_is_dir realgitdir/refs
  '
  
diff --combined t/test-lib-functions.sh
index 0367cec5fd,f233522f43..7308f67922
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@@ -309,26 -309,6 +309,26 @@@ test_unset_prereq () 
  }
  
  test_set_prereq () {
 +	if test -n "$GIT_TEST_FAIL_PREREQS"
 +	then
 +		case "$1" in
 +		# The "!" case is handled below with
 +		# test_unset_prereq()
 +		!*)
 +			;;
 +		# (Temporary?) whitelist of things we can't easily
 +		# pretend not to support
 +		SYMLINKS)
 +			;;
 +		# Inspecting whether GIT_TEST_FAIL_PREREQS is on
 +		# should be unaffected.
 +		FAIL_PREREQS)
 +			;;
 +		*)
 +			return
 +		esac
 +	fi
 +
  	case "$1" in
  	!*)
  		test_unset_prereq "${1#!}"
@@@ -908,6 -888,21 +908,21 @@@ test_cmp_rev () 
  	fi
  }
  
+ # Compare paths respecting core.ignoreCase
+ test_cmp_fspath () {
+ 	if test "x$1" = "x$2"
+ 	then
+ 		return 0
+ 	fi
+ 
+ 	if test true != "$(git config --get --type=bool core.ignorecase)"
+ 	then
+ 		return 1
+ 	fi
+ 
+ 	test "x$(echo "$1" | tr A-Z a-z)" =  "x$(echo "$2" | tr A-Z a-z)"
+ }
+ 
  # Print a sequence of integers in increasing order, either with
  # two arguments (start and end):
  #