test: trivial cleanups
No functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 28, 2013 at 07:54 UTC
15c7348eb0731f33a65fb08a27979640d44a7a3d
2 files changed
+9
-16
t/t3403-rebase-skip.sh
+4
-3
@@ -64,10 +64,11 @@ test_expect_success 'rebase with --merge' '
64
65
test_expect_success 'rebase --skip with --merge' '
66
git rebase --skip
67
- '
67
+'
68
69
-test_expect_success 'merge and reference trees equal' \
70
- 'test -z "`git diff-tree skip-merge skip-reference`"'
69
+test_expect_success 'merge and reference trees equal' '
70
+ test -z "`git diff-tree skip-merge skip-reference`"
71
+'
72
73
test_expect_success 'moved back to branch correctly' '
74
test refs/heads/skip-merge = $(git symbolic-ref HEAD)
t/t3505-cherry-pick-empty.sh
+5
-13
@@ -28,29 +28,21 @@ test_expect_success setup '
28
'
29
30
test_expect_success 'cherry-pick an empty commit' '
31
- git checkout master && {
32
- git cherry-pick empty-branch^
33
- test "$?" = 1
34
- }
31
+ git checkout master &&
32
+ test_expect_code 1 git cherry-pick empty-branch^
33
'
34
35
test_expect_success 'index lockfile was removed' '
38
-
36
test ! -f .git/index.lock
40
-
37
'
38
39
test_expect_success 'cherry-pick a commit with an empty message' '
44
- git checkout master && {
45
- git cherry-pick empty-branch
46
- test "$?" = 1
47
- }
40
+ git checkout master &&
41
+ test_expect_code 1 git cherry-pick empty-branch
42
'
43
44
test_expect_success 'index lockfile was removed' '
51
-
45
test ! -f .git/index.lock
53
-
46
'
47
48
test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' '
@@ -101,7 +93,7 @@ test_expect_success 'cherry-pick a no-op with --keep-redundant' '
93
git reset --hard &&
94
git checkout fork^0 &&
95
git cherry-pick --keep-redundant-commits master &&
104
- git show -s --format='%s' >actual &&
96
+ git show -s --format=%s >actual &&
97
echo "add file2 on master" >expect &&
98
test_cmp expect actual
99
'