t3406: modernize style
Update the following: - Quote 'setup' - Remove blank lines within test case body - Use test_commit instead of custom quick_one - Create branch "topic" from tag created by test_commit Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin von Zweigbergk committed
Jun 6, 2013 at 23:11 UTC
9e2248efdbc0327d1eee19d3b8e825e43f7df81f
1 file changed
+9
-21
t/t3406-rebase-message.sh
+9
-21
@@ -4,27 +4,17 @@ test_description='messages from rebase operation'
4
5
. ./test-lib.sh
6
7
-quick_one () {
8
- echo "$1" >"file$1" &&
9
- git add "file$1" &&
10
- test_tick &&
11
- git commit -m "$1"
12
-}
7
+test_expect_success 'setup' '
8
+ test_commit O fileO &&
9
+ test_commit X fileX &&
10
+ test_commit A fileA &&
11
+ test_commit B fileB &&
12
+ test_commit Y fileY &&
13
14
-test_expect_success setup '
15
- quick_one O &&
16
- git branch topic &&
17
- quick_one X &&
18
- quick_one A &&
19
- quick_one B &&
20
- quick_one Y &&
21
-
22
- git checkout topic &&
23
- quick_one A &&
24
- quick_one B &&
25
- quick_one Z &&
14
+ git checkout -b topic O &&
15
+ git cherry-pick A B &&
16
+ test_commit Z fileZ &&
17
git tag start
27
-
18
'
19
20
cat >expect <<\EOF
@@ -34,12 +24,10 @@ Committed: 0003 Z
24
EOF
25
26
test_expect_success 'rebase -m' '
37
-
27
git rebase -m master >report &&
28
sed -n -e "/^Already applied: /p" \
29
-e "/^Committed: /p" report >actual &&
30
test_cmp expect actual
42
-
31
'
32
33
test_expect_success 'rebase --stat' '