tests: move test for rebase messages from t3400 to t3406
t3406 is supposed to test "messages from rebase operation", so let's move tests in t3400 that fit that description into 3406. Most of the functionality they tested, except for the messages, has now been subsumed by t3420. 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
c9581cc8005d54680512cc6f22255b6847176f2b
2 files changed
+22
-22
t/t3400-rebase.sh
-22
@@ -59,28 +59,6 @@ test_expect_success 'rebase against master' '
59
git rebase master
60
'
61
62
-test_expect_success 'rebase against master twice' '
63
- git rebase master >out &&
64
- test_i18ngrep "Current branch my-topic-branch is up to date" out
65
-'
66
-
67
-test_expect_success 'rebase against master twice with --force' '
68
- git rebase --force-rebase master >out &&
69
- test_i18ngrep "Current branch my-topic-branch is up to date, rebase forced" out
70
-'
71
-
72
-test_expect_success 'rebase against master twice from another branch' '
73
- git checkout my-topic-branch^ &&
74
- git rebase master my-topic-branch >out &&
75
- test_i18ngrep "Current branch my-topic-branch is up to date" out
76
-'
77
-
78
-test_expect_success 'rebase fast-forward to master' '
79
- git checkout my-topic-branch^ &&
80
- git rebase my-topic-branch >out &&
81
- test_i18ngrep "Fast-forwarded HEAD to my-topic-branch" out
82
-'
83
-
62
test_expect_success 'the rebase operation should not have destroyed author information' '
63
! (git log | grep "Author:" | grep "<>")
64
'
t/t3406-rebase-message.sh
+22
@@ -30,6 +30,28 @@ test_expect_success 'rebase -m' '
30
test_cmp expect actual
31
'
32
33
+test_expect_success 'rebase against master twice' '
34
+ git rebase master >out &&
35
+ test_i18ngrep "Current branch topic is up to date" out
36
+'
37
+
38
+test_expect_success 'rebase against master twice with --force' '
39
+ git rebase --force-rebase master >out &&
40
+ test_i18ngrep "Current branch topic is up to date, rebase forced" out
41
+'
42
+
43
+test_expect_success 'rebase against master twice from another branch' '
44
+ git checkout topic^ &&
45
+ git rebase master topic >out &&
46
+ test_i18ngrep "Current branch topic is up to date" out
47
+'
48
+
49
+test_expect_success 'rebase fast-forward to master' '
50
+ git checkout topic^ &&
51
+ git rebase topic >out &&
52
+ test_i18ngrep "Fast-forwarded HEAD to topic" out
53
+'
54
+
55
test_expect_success 'rebase --stat' '
56
git reset --hard start &&
57
git rebase --stat master >diffstat.txt &&