diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:14 -0700 |
| commit | dc55e3e3c2be99ba1b26ba8ee5df428afde57e1b (patch) | |
| tree | 3418bf83b6f7426eb2293fe8c9f07ce474fb94e6 /t | |
| parent | Merge branch 'jw/gitweb-sample-update' into maint (diff) | |
| parent | t0001: fix on case-insensitive filesystems (diff) | |
| download | tgif-dc55e3e3c2be99ba1b26ba8ee5df428afde57e1b.tar.xz | |
Merge branch 'js/t0001-case-insensitive' into maint
Test update.
* js/t0001-case-insensitive:
t0001: fix on case-insensitive filesystems
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0001-init.sh | 22 | ||||
| -rw-r--r-- | t/test-lib-functions.sh | 15 |
2 files changed, 23 insertions, 14 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 0276d14a0b..77c5ed6a18 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -311,8 +311,8 @@ test_expect_success 'init prefers command line to GIT_DIR' ' 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 @@ test_expect_success 're-init on .git file' ' ' 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 @@ test_expect_success 're-init to update git link' ' 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 --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 8270de74be..f233522f43 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -888,6 +888,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): # |