aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-25 14:47:56 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-25 14:47:56 -0700
commit3613339eaf3638f7a22ee55f914308f8bab5f2cf (patch)
tree1721427f802507e63211f24db2dc41ad36184e43 /t
parent079f298513f9875dfd9f2eaaacc58c294c546571 (diff)
parentda02ca508b842e61c71d920310ff30bbe0238993 (diff)
downloadgit-3613339eaf3638f7a22ee55f914308f8bab5f2cf.tar.gz
git-3613339eaf3638f7a22ee55f914308f8bab5f2cf.tar.xz
Merge branch 'jc/maint-checkout-index-to-prefix'
* 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 f7e1a735e..de3edb5d5 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