diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 08:31:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 08:31:46 -0700 |
commit | 4b2405ce19f21f2104de14c4e70ac58dcf616750 (patch) | |
tree | b98722062e4a66e2945a2ba185b11868d22a5a32 /t | |
parent | e3ed7f721c7bd4ecb5c98a29761ff2b2e6d38336 (diff) | |
parent | efad1a5615e80637dcb38c8eaa1e35c03b24169f (diff) | |
download | git-4b2405ce19f21f2104de14c4e70ac58dcf616750.tar.gz git-4b2405ce19f21f2104de14c4e70ac58dcf616750.tar.xz |
Merge branch 'cb/ls-files-cdup' into maint
* cb/ls-files-cdup:
ls-files: allow relative pathspec
quote.c: separate quoting and relative path generation
Diffstat (limited to 't')
-rwxr-xr-x | t/t7010-setup.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/t/t7010-setup.sh b/t/t7010-setup.sh index d8a7c7985..0335a9a15 100755 --- a/t/t7010-setup.sh +++ b/t/t7010-setup.sh @@ -103,14 +103,10 @@ test_expect_success 'git ls-files (relative #3)' ' git add a && ( cd a/b && - if git ls-files "../e/f" - then - echo Gaah, should have failed - exit 1 - else - : happy - fi - ) + git ls-files "../e/f" + ) >current && + echo ../e/f >expect && + test_cmp expect current ' |