summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-09-16 14:26:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-09-16 14:26:40 -0700
commitbba287531b3a845faa032a8fef3e6d70d185c89b (patch)
treee234c232ce0b8acef3f43fa34c036e68522b5612 /t
parentMerge branch 'rc/maint-http-no-head-pack-check' into maint (diff)
parentcheck_path(): allow symlinked directories to checkout-index --prefix (diff)
downloadtgif-bba287531b3a845faa032a8fef3e6d70d185c89b.tar.xz
Merge branch 'jc/maint-checkout-index-to-prefix' into maint
* jc/maint-checkout-index-to-prefix: check_path(): allow symlinked directories to checkout-index --prefix
Diffstat (limited to 't')
-rwxr-xr-xt/t2000-checkout-cache-clash.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t2000-checkout-cache-clash.sh b/t/t2000-checkout-cache-clash.sh
index f7e1a735ec..de3edb5d57 100755
--- a/t/t2000-checkout-cache-clash.sh
+++ b/t/t2000-checkout-cache-clash.sh
@@ -48,4 +48,13 @@ test_expect_success \
'git checkout-index conflicting paths.' \
'test -f path0 && test -d path1 && test -f path1/file1'
+test_expect_success SYMLINKS 'checkout-index -f twice with --prefix' '
+ mkdir -p tar/get &&
+ ln -s tar/get there &&
+ echo first &&
+ git checkout-index -a -f --prefix=there/ &&
+ echo second &&
+ git checkout-index -a -f --prefix=there/
+'
+
test_done