diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-06 16:46:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 16:46:36 -0700 |
| commit | 347c47e61e5daf1efb3503724a431e4316c6eb5b (patch) | |
| tree | f5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /t/t1020-subdirectory.sh | |
| parent | c2e0940b44ded03f0af02be95c35b231fea633c1 (diff) | |
| parent | fd4ec4f2bb980ce07bb28d5823a95610f251d00b (diff) | |
| download | git-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.gz | |
Merge branch 'jl/maint-fix-test'
* jl/maint-fix-test:
Several tests: cd inside subshell instead of around
Conflicts:
t/t9600-cvsimport.sh
Diffstat (limited to 't/t1020-subdirectory.sh')
| -rwxr-xr-x | t/t1020-subdirectory.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index 56874996a6..c36157a896 100755 --- a/t/t1020-subdirectory.sh +++ b/t/t1020-subdirectory.sh @@ -27,13 +27,13 @@ test_expect_success 'update-index and ls-files' ' one) echo pass one ;; *) echo bad one; exit 1 ;; esac && - cd dir && + (cd dir && git update-index --add two && case "`git ls-files`" in two) echo pass two ;; *) echo bad two; exit 1 ;; - esac && - cd .. && + esac + ) && case "`git ls-files`" in dir/two"$LF"one) echo pass both ;; *) echo bad; exit 1 ;; |