mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t0001: fix on case-insensitive filesystems

Browse Source 
On a case-insensitive filesystem, such as HFS+ or NTFS, it is possible
that the idea Bash has of the current directory differs in case from
what Git thinks it is. That's totally okay, though, and we should not
expect otherwise.

On Windows, for example, when you call

	cd C:\GIT-SDK-64

in a PowerShell and there exists a directory called `C:\git-sdk-64`, the
current directory will be reported in all upper-case. Even in a Bash
that you might call from that PowerShell. Git, however, will have
normalized this via `GetFinalPathByHandle()`, and the expectation in
t0001 that the recorded gitdir will match what `pwd` says will be
violated.

Let's address this by comparing these paths in a case-insensitive
manner when `core.ignoreCase` is `true`.

Reported by Jameson Miller.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2019-06-24 19:40:05 +02:00
committed by Junio C Hamano
parent b697d92f56
commit ed33bd8f30
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
t/t0001-init.sh
View File

@ -311,8 +311,8 @@ test_expect_success 'init prefers command line to GIT_DIR' '
test_expect_success 'init with separate gitdir' ' test_expect_success 'init with separate gitdir' '
rm -rf newdir && rm -rf newdir &&
git init --separate-git-dir realgitdir newdir && git init --separate-git-dir realgitdir newdir &&
echo "gitdir: $(pwd)/realgitdir" >expected && newdir_git="$(cat newdir/.git)" &&
test_cmp expected newdir/.git && test_cmp_fspath "$(pwd)/realgitdir" "${newdir_git#gitdir: }" &&
test_path_is_dir realgitdir/refs 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' ' test_expect_success 're-init to update git link' '
( git -C newdir init --separate-git-dir ../surrealgitdir &&
cd newdir && newdir_git="$(cat newdir/.git)" &&
git init --separate-git-dir ../surrealgitdir test_cmp_fspath "$(pwd)/surrealgitdir" "${newdir_git#gitdir: }" &&
) &&
echo "gitdir: $(pwd)/surrealgitdir" >expected &&
test_cmp expected newdir/.git &&
test_path_is_dir surrealgitdir/refs && test_path_is_dir surrealgitdir/refs &&
test_path_is_missing realgitdir/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' ' test_expect_success 're-init to move gitdir' '
rm -rf newdir realgitdir surrealgitdir && rm -rf newdir realgitdir surrealgitdir &&
git init newdir && git init newdir &&
( git -C newdir init --separate-git-dir ../realgitdir &&
cd newdir && newdir_git="$(cat newdir/.git)" &&
git init --separate-git-dir ../realgitdir test_cmp_fspath "$(pwd)/realgitdir" "${newdir_git#gitdir: }" &&
) &&
echo "gitdir: $(pwd)/realgitdir" >expected &&
test_cmp expected newdir/.git &&
test_path_is_dir realgitdir/refs test_path_is_dir realgitdir/refs
' '

15
t/test-lib-functions.sh
View File

@ -888,6 +888,21 @@ test_cmp_rev () {
fi 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 # Print a sequence of integers in increasing order, either with
# two arguments (start and end): # two arguments (start and end):
# #