summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-03-20 19:17:15 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-21 14:27:52 -0700
commit3d06c5f19daf6710d99b6e4c7c0d097c8ce528fc (patch)
tree6fcb8a7987afbecdfe7648899f652e9d02e1022f
parentt: prefer "git config --file" to GIT_CONFIG (diff)
downloadtgif-3d06c5f19daf6710d99b6e4c7c0d097c8ce528fc.tar.xz
t0001: make symlink reinit test more careful
In the final test of t0001, we have a repo whose .git is a symlink to a directory "here", and we use "--separate-git-dir" to migrate that to a .git file pointing to a different directory. We check that the data is migrated to the new directory and that .git looks like a git-file. We also check that "here" is not a directory, which is slightly misleading. It should not be a directory, but neither should it be gone. It is the actual resting place of the git-file, and .git remains a symlink to it. Let's check that more explicitly, both to make our test more robust, and to make further cleanups in this area more obvious. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t0001-init.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 9b05fdf765..5245711986 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -402,8 +402,8 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
) &&
echo "gitdir: `pwd`/realgitdir" >expected &&
test_cmp expected newdir/.git &&
- test -d realgitdir/refs &&
- ! test -d newdir/here
+ test_cmp expected newdir/here &&
+ test -d realgitdir/refs
'
test_done