diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-09-16 14:26:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-16 14:26:40 -0700 |
| commit | bba287531b3a845faa032a8fef3e6d70d185c89b (patch) | |
| tree | e234c232ce0b8acef3f43fa34c036e68522b5612 /t | |
| parent | 4197ce3c6d943759e1088a0298b64571b4bc725a (diff) | |
| parent | da02ca508b842e61c71d920310ff30bbe0238993 (diff) | |
| download | git-bba287531b3a845faa032a8fef3e6d70d185c89b.tar.gz git-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-x | t/t2000-checkout-cache-clash.sh | 9 |
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 |