t3432: make these tests work with either am or merge backends
t3432 had several stress tests for can_fast_forward(), whose intent was to ensure we were using the optimization of just fast forwarding when possible. However, these tests verified that fast forwards had happened based on the output that rebase printed to the terminal. We can instead test more directly that we actually fast-forwarded by checking the reflog, which also has the side effect of making the tests applicable for the merge/interactive backend. This change does lose the distinction between "noop" and "noop-force", but as stated in commit c9efc216830f ("t3432: test for --no-ff's interaction with fast-forward", 2019-08-27) which introduced that distinction: "These tests aren't supposed to endorse the status quo, just test for what we're currently doing.". This change does not actually run these tests with the merge/interactive backend; instead this is just a preparatory commit. A subsequent commit which fixes can_fast_forward() to work with that backend will then also change t3432 to add tests of that backend as well. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Feb 15, 2020 at 21:36 UTC
9a70f3d4ae673e02e78b1061fcc8fc01bc8d9276
1 file changed
+22
-26
t/t3432-rebase-fast-forward.sh
+22
-26
@@ -44,19 +44,15 @@ test_rebase_same_head_ () {
44
test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" "
45
oldhead=\$(git rev-parse HEAD) &&
46
test_when_finished 'git reset --hard \$oldhead' &&
47
+ cp .git/logs/HEAD expect &&
48
git rebase$flag $* >stdout &&
49
if test $what = work
50
then
50
- # Must check this case first, for 'is up to
51
- # date, rebase forced[...]rewinding head' cases
52
- test_i18ngrep 'rewinding head' stdout
51
+ old=\$(wc -l <expect) &&
52
+ test_line_count '-gt' \$old .git/logs/HEAD
53
elif test $what = noop
54
then
55
- test_i18ngrep 'is up to date' stdout &&
56
- test_i18ngrep ! 'rebase forced' stdout
57
- elif test $what = noop-force
58
- then
59
- test_i18ngrep 'is up to date, rebase forced' stdout
55
+ test_cmp expect .git/logs/HEAD
56
fi &&
57
newhead=\$(git rev-parse HEAD) &&
58
if test $cmp = same
@@ -71,14 +67,14 @@ test_rebase_same_head_ () {
67
68
changes='no changes'
69
test_rebase_same_head success noop same success work same
74
-test_rebase_same_head success noop same success noop-force same master
75
-test_rebase_same_head success noop same success noop-force diff --onto B B
76
-test_rebase_same_head success noop same success noop-force diff --onto B... B
77
-test_rebase_same_head success noop same success noop-force same --onto master... master
78
-test_rebase_same_head success noop same success noop-force same --keep-base master
79
-test_rebase_same_head success noop same success noop-force same --keep-base
80
-test_rebase_same_head success noop same success noop-force same --no-fork-point
81
-test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
70
+test_rebase_same_head success noop same success work same master
71
+test_rebase_same_head success noop same success work diff --onto B B
72
+test_rebase_same_head success noop same success work diff --onto B... B
73
+test_rebase_same_head success noop same success work same --onto master... master
74
+test_rebase_same_head success noop same success work same --keep-base master
75
+test_rebase_same_head success noop same success work same --keep-base
76
+test_rebase_same_head success noop same success work same --no-fork-point
77
+test_rebase_same_head success noop same success work same --keep-base --no-fork-point
78
test_rebase_same_head success noop same success work same --fork-point master
79
test_rebase_same_head success noop same success work diff --fork-point --onto B B
80
test_rebase_same_head success noop same success work diff --fork-point --onto B... B
@@ -91,14 +87,14 @@ test_expect_success 'add work same to side' '
87
88
changes='our changes'
89
test_rebase_same_head success noop same success work same
94
-test_rebase_same_head success noop same success noop-force same master
95
-test_rebase_same_head success noop same success noop-force diff --onto B B
96
-test_rebase_same_head success noop same success noop-force diff --onto B... B
97
-test_rebase_same_head success noop same success noop-force same --onto master... master
98
-test_rebase_same_head success noop same success noop-force same --keep-base master
99
-test_rebase_same_head success noop same success noop-force same --keep-base
100
-test_rebase_same_head success noop same success noop-force same --no-fork-point
101
-test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
90
+test_rebase_same_head success noop same success work same master
91
+test_rebase_same_head success noop same success work diff --onto B B
92
+test_rebase_same_head success noop same success work diff --onto B... B
93
+test_rebase_same_head success noop same success work same --onto master... master
94
+test_rebase_same_head success noop same success work same --keep-base master
95
+test_rebase_same_head success noop same success work same --keep-base
96
+test_rebase_same_head success noop same success work same --no-fork-point
97
+test_rebase_same_head success noop same success work same --keep-base --no-fork-point
98
test_rebase_same_head success noop same success work same --fork-point master
99
test_rebase_same_head success noop same success work diff --fork-point --onto B B
100
test_rebase_same_head success noop same success work diff --fork-point --onto B... B
@@ -112,8 +108,8 @@ test_expect_success 'add work same to upstream' '
108
'
109
110
changes='our and their changes'
115
-test_rebase_same_head success noop same success noop-force diff --onto B B
116
-test_rebase_same_head success noop same success noop-force diff --onto B... B
111
+test_rebase_same_head success noop same success work diff --onto B B
112
+test_rebase_same_head success noop same success work diff --onto B... B
113
test_rebase_same_head success noop same success work diff --onto master... master
114
test_rebase_same_head success noop same success work diff --keep-base master
115
test_rebase_same_head success noop same success work diff --keep-base