summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-18 11:42:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-18 11:42:36 -0700
commit01e0fa2b3742e41d172933839a75f54d5df36ef3 (patch)
treeeada10d09120348f2d33916b7d1956b290be7d7d /t
parentMerge branch 'jk/pager-bypass-cat-for-default-pager' (diff)
parentMake setup_git_env() resolve .git file when $GIT_DIR is not specified (diff)
downloadtgif-01e0fa2b3742e41d172933839a75f54d5df36ef3.tar.xz
Merge branch 'nd/git-dir-pointing-at-gitfile'
We made sure that we notice the user-supplied GIT_DIR is actually a gitfile, but did not do the same when the default ".git" is a gitfile. * nd/git-dir-pointing-at-gitfile: Make setup_git_env() resolve .git file when $GIT_DIR is not specified
Diffstat (limited to 't')
-rwxr-xr-xt/t0001-init.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index ad66410564..9fb582b192 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -379,6 +379,10 @@ test_expect_success 'init with separate gitdir' '
test -d realgitdir/refs
'
+test_expect_success 're-init on .git file' '
+ ( cd newdir && git init )
+'
+
test_expect_success 're-init to update git link' '
(
cd newdir &&