diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:40:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-15 12:40:12 -0700 |
| commit | e3f213c7aff9e09b3bde7253a0a922467dd13671 (patch) | |
| tree | e13c2d747a8afdbd96c001d88626204f0b4d20a9 /t/t3060-ls-files-with-tree.sh | |
| parent | 43d268e9dd5a454abc2e6ae676202773ffd54537 (diff) | |
| parent | fd3c32c9815441ebbc3d46a3ff4ef862b3a9688c (diff) | |
| download | git-e3f213c7aff9e09b3bde7253a0a922467dd13671.tar.gz | |
Merge branch 'jl/fix-test'
* jl/fix-test:
t1020: Get rid of 'cd "$HERE"' at the start of each test
t2016 (checkout -p): add missing &&
t1302 (core.repositoryversion): style tweaks
t2105 (gitfile): add missing &&
t1450 (fsck): remove dangling objects
tests: subshell indentation stylefix
Several tests: cd inside subshell instead of around
Diffstat (limited to 't/t3060-ls-files-with-tree.sh')
| -rwxr-xr-x | t/t3060-ls-files-with-tree.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/t/t3060-ls-files-with-tree.sh b/t/t3060-ls-files-with-tree.sh index 3ce501bb97..61c1f53d1b 100755 --- a/t/t3060-ls-files-with-tree.sh +++ b/t/t3060-ls-files-with-tree.sh @@ -53,17 +53,15 @@ test_expect_success setup ' git add . ' -# We have to run from a sub-directory to trigger prune_path -# Then we finally get to run our --with-tree test -cd sub - test_expect_success 'git -ls-files --with-tree should succeed from subdir' ' - - git ls-files --with-tree=HEAD~1 >../output - + # We have to run from a sub-directory to trigger prune_path + # Then we finally get to run our --with-tree test + ( + cd sub && + git ls-files --with-tree=HEAD~1 >../output + ) ' -cd .. test_expect_success \ 'git -ls-files --with-tree should add entries from named tree.' \ 'test_cmp expected output' |