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/t9105-git-svn-commit-diff.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/t9105-git-svn-commit-diff.sh')
-rwxr-xr-x | t/t9105-git-svn-commit-diff.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9105-git-svn-commit-diff.sh b/t/t9105-git-svn-commit-diff.sh index dd48e9cba8..d432d835ae 100755 --- a/t/t9105-git-svn-commit-diff.sh +++ b/t/t9105-git-svn-commit-diff.sh @@ -6,10 +6,10 @@ test_description='git svn commit-diff' test_expect_success 'initialize repo' ' mkdir import && - cd import && + (cd import && echo hello > readme && - svn_cmd import -m "initial" . "$svnrepo" && - cd .. && + svn_cmd import -m "initial" . "$svnrepo" + ) && echo hello > readme && git update-index --add readme && git commit -a -m "initial" && |