summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>2011-12-09 08:59:11 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-12-11 21:15:15 -0800
commitf73e5ee5667138bbcb4220189e36e3ec06168c3f (patch)
treee4a1028ac5d1e0103b20ca0b11a1dfbd4dad147f /t
parentt3040 (subprojects-basic): fix '&&' chaining, modernize style (diff)
downloadtgif-f73e5ee5667138bbcb4220189e36e3ec06168c3f.tar.xz
t3401: modernize style
Put the opening quote starting each test on the same line as the test_expect_* invocation. Also make sure to use tabs for indentation. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3401-rebase-partial.sh67
1 files changed, 33 insertions, 34 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
index aea6685984..d7c874ceb8 100755
--- a/t/t3401-rebase-partial.sh
+++ b/t/t3401-rebase-partial.sh
@@ -11,51 +11,50 @@ local branch.
'
. ./test-lib.sh
-test_expect_success \
- 'prepare repository with topic branch' \
- 'echo First > A &&
- git update-index --add A &&
- git commit -m "Add A." &&
+test_expect_success 'prepare repository with topic branch' '
+ echo First > A &&
+ git update-index --add A &&
+ git commit -m "Add A." &&
- git checkout -b my-topic-branch &&
+ git checkout -b my-topic-branch &&
- echo Second > B &&
- git update-index --add B &&
- git commit -m "Add B." &&
+ echo Second > B &&
+ git update-index --add B &&
+ git commit -m "Add B." &&
- echo AnotherSecond > C &&
- git update-index --add C &&
- git commit -m "Add C." &&
+ echo AnotherSecond > C &&
+ git update-index --add C &&
+ git commit -m "Add C." &&
- git checkout -f master &&
+ git checkout -f master &&
- echo Third >> A &&
- git update-index A &&
- git commit -m "Modify A."
+ echo Third >> A &&
+ git update-index A &&
+ git commit -m "Modify A."
'
-test_expect_success \
- 'pick top patch from topic branch into master' \
- 'git cherry-pick my-topic-branch^0 &&
- git checkout -f my-topic-branch &&
- git branch master-merge master &&
- git branch my-topic-branch-merge my-topic-branch
+test_expect_success 'pick top patch from topic branch into master' '
+ git cherry-pick my-topic-branch^0 &&
+ git checkout -f my-topic-branch &&
+ git branch master-merge master &&
+ git branch my-topic-branch-merge my-topic-branch
'
-test_debug \
- 'git cherry master &&
- git format-patch -k --stdout --full-index master >/dev/null &&
- gitk --all & sleep 1
+test_debug '
+ git cherry master &&
+ git format-patch -k --stdout --full-index master >/dev/null &&
+ gitk --all & sleep 1
'
-test_expect_success \
- 'rebase topic branch against new master and check git am did not get halted' \
- 'git rebase master && test ! -d .git/rebase-apply'
+test_expect_success 'rebase topic branch against new master and check git am did not get halted' '
+ git rebase master &&
+ test ! -d .git/rebase-apply
+'
-test_expect_success \
- 'rebase --merge topic branch that was partially merged upstream' \
- 'git checkout -f my-topic-branch-merge &&
- git rebase --merge master-merge &&
- test ! -d .git/rebase-merge'
+test_expect_success 'rebase --merge topic branch that was partially merged upstream' '
+ git checkout -f my-topic-branch-merge &&
+ git rebase --merge master-merge &&
+ test ! -d .git/rebase-merge
+'
test_done