rebase: fast-forward --fork-point in more cases
Before, when we rebased with a --fork-point invocation where the fork-point wasn't empty, we would be setting options.restrict_revision. The fast-forward logic would automatically declare that the rebase was not fast-forwardable if it was set. However, this was painting with a very broad brush. Refine the logic so that we can fast-forward in the case where the restricted revision is equal to the merge base, since we stop rebasing at the merge base anyway. Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Aug 27, 2019 at 01:38 UTC
4effc5bc96ab8cd057e034c11d6f4b93b49cb0a3
2 files changed
+17
-13
builtin/rebase.c
+7
-3
@@ -1261,6 +1261,7 @@ static int is_linear_history(struct commit *from, struct commit *to)
1261
}
1262
1263
static int can_fast_forward(struct commit *onto, struct commit *upstream,
1264
+ struct commit *restrict_revision,
1265
struct object_id *head_oid, struct object_id *merge_base)
1266
{
1267
struct commit *head = lookup_commit(the_repository, head_oid);
@@ -1280,6 +1281,9 @@ static int can_fast_forward(struct commit *onto, struct commit *upstream,
1281
if (!oideq(merge_base, &onto->object.oid))
1282
goto done;
1283
1284
+ if (restrict_revision && !oideq(&restrict_revision->object.oid, merge_base))
1285
+ goto done;
1286
+
1287
if (!upstream)
1288
goto done;
1289
@@ -2042,9 +2046,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
2046
* with new commits recreated by replaying their changes. This
2047
* optimization must not be done if this is an interactive rebase.
2048
*/
2045
- if (can_fast_forward(options.onto, options.upstream, &options.orig_head,
2046
- &merge_base) &&
2047
- !is_interactive(&options) && !options.restrict_revision) {
2049
+ if (can_fast_forward(options.onto, options.upstream, options.restrict_revision,
2050
+ &options.orig_head, &merge_base) &&
2051
+ !is_interactive(&options)) {
2052
int flag;
2053
2054
if (!(options.flags & REBASE_FORCE)) {
t/t3432-rebase-fast-forward.sh
+10
-10
@@ -70,32 +70,32 @@ test_rebase_same_head_ () {
70
}
71
72
changes='no changes'
73
-test_rebase_same_head success work same success work same
73
+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 --no-fork-point
79
-test_rebase_same_head success work same success work same --fork-point master
80
-test_rebase_same_head failure noop same success work diff --fork-point --onto B B
81
-test_rebase_same_head failure work same success work diff --fork-point --onto B... B
82
-test_rebase_same_head success work same success work same --fork-point --onto master... master
79
+test_rebase_same_head success noop same success work same --fork-point master
80
+test_rebase_same_head success noop same success work diff --fork-point --onto B B
81
+test_rebase_same_head success noop same success work diff --fork-point --onto B... B
82
+test_rebase_same_head success noop same success work same --fork-point --onto master... master
83
84
test_expect_success 'add work same to side' '
85
test_commit E
86
'
87
88
changes='our changes'
89
-test_rebase_same_head success work same success work same
89
+test_rebase_same_head success noop same success work same
90
test_rebase_same_head success noop same success noop-force same master
91
test_rebase_same_head success noop same success noop-force diff --onto B B
92
test_rebase_same_head success noop same success noop-force diff --onto B... B
93
test_rebase_same_head success noop same success noop-force same --onto master... master
94
test_rebase_same_head success noop same success noop-force same --no-fork-point
95
-test_rebase_same_head success work same success work same --fork-point master
96
-test_rebase_same_head failure work same success work diff --fork-point --onto B B
97
-test_rebase_same_head failure work same success work diff --fork-point --onto B... B
98
-test_rebase_same_head success work same success work same --fork-point --onto master... master
95
+test_rebase_same_head success noop same success work same --fork-point master
96
+test_rebase_same_head success noop same success work diff --fork-point --onto B B
97
+test_rebase_same_head success noop same success work diff --fork-point --onto B... B
98
+test_rebase_same_head success noop same success work same --fork-point --onto master... master
99
100
test_expect_success 'add work same to upstream' '
101
git checkout master &&