From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:14 +0000 (-0700)
Subject: Merge branch 'js/t0001-case-insensitive' into maint
X-Git-Tag: v2.23.0-rc0~1^2~27
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dc55e3e3c2be99ba1b26ba8ee5df428afde57e1b?hp=-c

Merge branch 'js/t0001-case-insensitive' into maint

Test update.

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

dc55e3e3c2be99ba1b26ba8ee5df428afde57e1b
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
  '