summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-07-30 13:20:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-07-30 13:20:32 -0700
commitf175e9b845a41f1a5135222d4d3b8aa9161b499a (patch)
tree5b0fc41171176ae07772e5e196b335e4c3dab65c /t
parentMerge branch 'pb/log-rev-list-doc' into master (diff)
parentgit clone: don't clone into non-empty directory (diff)
downloadtgif-f175e9b845a41f1a5135222d4d3b8aa9161b499a.tar.xz
Merge branch 'bw/fail-cloning-into-non-empty' into master
"git clone --separate-git-dir=$elsewhere" used to stomp on the contents of the existing directory $elsewhere, which has been taught to fail when $elsewhere is not an empty directory. * bw/fail-cloning-into-non-empty: git clone: don't clone into non-empty directory
Diffstat (limited to 't')
-rwxr-xr-xt/t5601-clone.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 84ea2a3eb7..eb9a093e25 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -271,7 +271,9 @@ test_expect_success 'fetch from gitfile parent' '
test_expect_success 'clone separate gitdir where target already exists' '
rm -rf dst &&
- test_must_fail git clone --separate-git-dir realgitdir src dst
+ echo foo=bar >>realgitdir/config &&
+ test_must_fail git clone --separate-git-dir realgitdir src dst &&
+ grep foo=bar realgitdir/config
'
test_expect_success 'clone --reference from original' '