提交 dc55e3e3 编写于 作者: J Junio C Hamano

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

Test update.

* js/t0001-case-insensitive:
  t0001: fix on case-insensitive filesystems
...@@ -311,8 +311,8 @@ test_expect_success 'init prefers command line to GIT_DIR' ' ...@@ -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' ' ...@@ -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' ' ...@@ -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
' '
......
...@@ -888,6 +888,21 @@ test_cmp_rev () { ...@@ -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):
# #
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册