diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-09-06 20:42:54 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-09 15:56:20 -0700 |
| commit | 18a826924284339e2b637ab747f196235bee1939 (patch) | |
| tree | e6ecbd53b0bd739099b49d376f57fadcdc2da569 /t/t3409-rebase-preserve-merges.sh | |
| parent | 347c47e61e5daf1efb3503724a431e4316c6eb5b (diff) | |
| download | git-18a826924284339e2b637ab747f196235bee1939.tar.gz git-18a826924284339e2b637ab747f196235bee1939.tar.xz | |
tests: subshell indentation stylefix
Format the subshells introduced by the previous patch (Several tests:
cd inside subshell instead of around, 2010-09-06) like so:
(
cd subdir &&
...
) &&
This is generally easier to read and has the nice side-effect that
this patch will show what commands are used in the subshell, making
it easier to check for lost environment variables and similar
behavior changes.
Cc: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3409-rebase-preserve-merges.sh')
| -rwxr-xr-x | t/t3409-rebase-preserve-merges.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index 1a362d231..74161a42e 100755 --- a/t/t3409-rebase-preserve-merges.sh +++ b/t/t3409-rebase-preserve-merges.sh @@ -52,12 +52,13 @@ test_expect_success 'setup for merge-preserving rebase' \ git commit -m "Add different B" && git clone ./. clone2 && - (cd clone2 && - git checkout -b topic origin/topic && - test_must_fail git merge origin/master && - echo Resolved > B && - git add B && - git commit -m "Merge origin/master into topic" + ( + cd clone2 && + git checkout -b topic origin/topic && + test_must_fail git merge origin/master && + echo Resolved >B && + git add B && + git commit -m "Merge origin/master into topic" ) && git checkout topic && |