Skip to content

Commit bf8126f

Browse files
committed
Merge branch 'js/t0001-case-insensitive'
Test update. * js/t0001-case-insensitive: t0001: fix on case-insensitive filesystems
2 parents 3e6c6b7 + ed33bd8 commit bf8126f

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

t/t0001-init.sh

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ test_expect_success 'init prefers command line to GIT_DIR' '
311311
test_expect_success 'init with separate gitdir' '
312312
rm -rf newdir &&
313313
git init --separate-git-dir realgitdir newdir &&
314-
echo "gitdir: $(pwd)/realgitdir" >expected &&
315-
test_cmp expected newdir/.git &&
314+
newdir_git="$(cat newdir/.git)" &&
315+
test_cmp_fspath "$(pwd)/realgitdir" "${newdir_git#gitdir: }" &&
316316
test_path_is_dir realgitdir/refs
317317
'
318318

@@ -361,25 +361,19 @@ test_expect_success 're-init on .git file' '
361361
'
362362

363363
test_expect_success 're-init to update git link' '
364-
(
365-
cd newdir &&
366-
git init --separate-git-dir ../surrealgitdir
367-
) &&
368-
echo "gitdir: $(pwd)/surrealgitdir" >expected &&
369-
test_cmp expected newdir/.git &&
364+
git -C newdir init --separate-git-dir ../surrealgitdir &&
365+
newdir_git="$(cat newdir/.git)" &&
366+
test_cmp_fspath "$(pwd)/surrealgitdir" "${newdir_git#gitdir: }" &&
370367
test_path_is_dir surrealgitdir/refs &&
371368
test_path_is_missing realgitdir/refs
372369
'
373370

374371
test_expect_success 're-init to move gitdir' '
375372
rm -rf newdir realgitdir surrealgitdir &&
376373
git init newdir &&
377-
(
378-
cd newdir &&
379-
git init --separate-git-dir ../realgitdir
380-
) &&
381-
echo "gitdir: $(pwd)/realgitdir" >expected &&
382-
test_cmp expected newdir/.git &&
374+
git -C newdir init --separate-git-dir ../realgitdir &&
375+
newdir_git="$(cat newdir/.git)" &&
376+
test_cmp_fspath "$(pwd)/realgitdir" "${newdir_git#gitdir: }" &&
383377
test_path_is_dir realgitdir/refs
384378
'
385379

t/test-lib-functions.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -908,6 +908,21 @@ test_cmp_rev () {
908908
fi
909909
}
910910

911+
# Compare paths respecting core.ignoreCase
912+
test_cmp_fspath () {
913+
if test "x$1" = "x$2"
914+
then
915+
return 0
916+
fi
917+
918+
if test true != "$(git config --get --type=bool core.ignorecase)"
919+
then
920+
return 1
921+
fi
922+
923+
test "x$(echo "$1" | tr A-Z a-z)" = "x$(echo "$2" | tr A-Z a-z)"
924+
}
925+
911926
# Print a sequence of integers in increasing order, either with
912927
# two arguments (start and end):
913928
#

0 commit comments

Comments
 (0)