Skip to content

Commit f73e5ee

Browse files
Martin von Zweigbergkgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5e11362 commit f73e5ee

File tree

1 file changed

+33
-34
lines changed

1 file changed

+33
-34
lines changed

t/t3401-rebase-partial.sh

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,50 @@ local branch.
1111
'
1212
. ./test-lib.sh
1313

14-
test_expect_success \
15-
'prepare repository with topic branch' \
16-
'echo First > A &&
17-
git update-index --add A &&
18-
git commit -m "Add A." &&
14+
test_expect_success 'prepare repository with topic branch' '
15+
echo First > A &&
16+
git update-index --add A &&
17+
git commit -m "Add A." &&
1918
20-
git checkout -b my-topic-branch &&
19+
git checkout -b my-topic-branch &&
2120
22-
echo Second > B &&
23-
git update-index --add B &&
24-
git commit -m "Add B." &&
21+
echo Second > B &&
22+
git update-index --add B &&
23+
git commit -m "Add B." &&
2524
26-
echo AnotherSecond > C &&
27-
git update-index --add C &&
28-
git commit -m "Add C." &&
25+
echo AnotherSecond > C &&
26+
git update-index --add C &&
27+
git commit -m "Add C." &&
2928
30-
git checkout -f master &&
29+
git checkout -f master &&
3130
32-
echo Third >> A &&
33-
git update-index A &&
34-
git commit -m "Modify A."
31+
echo Third >> A &&
32+
git update-index A &&
33+
git commit -m "Modify A."
3534
'
3635

37-
test_expect_success \
38-
'pick top patch from topic branch into master' \
39-
'git cherry-pick my-topic-branch^0 &&
40-
git checkout -f my-topic-branch &&
41-
git branch master-merge master &&
42-
git branch my-topic-branch-merge my-topic-branch
36+
test_expect_success 'pick top patch from topic branch into master' '
37+
git cherry-pick my-topic-branch^0 &&
38+
git checkout -f my-topic-branch &&
39+
git branch master-merge master &&
40+
git branch my-topic-branch-merge my-topic-branch
4341
'
4442

45-
test_debug \
46-
'git cherry master &&
47-
git format-patch -k --stdout --full-index master >/dev/null &&
48-
gitk --all & sleep 1
43+
test_debug '
44+
git cherry master &&
45+
git format-patch -k --stdout --full-index master >/dev/null &&
46+
gitk --all & sleep 1
4947
'
5048

51-
test_expect_success \
52-
'rebase topic branch against new master and check git am did not get halted' \
53-
'git rebase master && test ! -d .git/rebase-apply'
49+
test_expect_success 'rebase topic branch against new master and check git am did not get halted' '
50+
git rebase master &&
51+
test ! -d .git/rebase-apply
52+
'
5453

55-
test_expect_success \
56-
'rebase --merge topic branch that was partially merged upstream' \
57-
'git checkout -f my-topic-branch-merge &&
58-
git rebase --merge master-merge &&
59-
test ! -d .git/rebase-merge'
54+
test_expect_success 'rebase --merge topic branch that was partially merged upstream' '
55+
git checkout -f my-topic-branch-merge &&
56+
git rebase --merge master-merge &&
57+
test ! -d .git/rebase-merge
58+
'
6059

6160
test_done

0 commit comments

Comments
 (0)