rebase: simplify code related to imply_merge()
The code's evolution left in some bits surrounding enum rebase_type that don't really make sense any more. In particular, it makes no sense to invoke imply_merge() if the type is already known not to be REBASE_APPLY, and it makes no sense to assign the type after calling imply_merge(). enum rebase_type had more values until commit a74b35081c ("rebase: drop support for `--preserve-merges`") and commit 10cdb9f38a ("rebase: rename the two primary rebase backends"). The latter commit also renamed imply_interactive() to imply_merge(). Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Oswald Buddenhagen committed
Oct 20, 2023 at 11:36 UTC
a5b5740bf63cd435fb172b12aa97176f13ff3fd3
1 file changed
+1
-5
builtin/rebase.c
+1
-5
@@ -386,7 +386,6 @@ static int parse_opt_keep_empty(const struct option *opt, const char *arg,
386
387
imply_merge(opts, unset ? "--no-keep-empty" : "--keep-empty");
388
opts->keep_empty = !unset;
389
- opts->type = REBASE_MERGE;
389
return 0;
390
}
391
@@ -1505,9 +1504,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1504
}
1505
}
1506
1508
- if (options.type == REBASE_MERGE)
1509
- imply_merge(&options, "--merge");
1510
-
1507
if (options.root && !options.onto_name)
1508
imply_merge(&options, "--root without --onto");
1509
@@ -1552,7 +1548,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1548
1549
if (options.type == REBASE_UNSPECIFIED) {
1550
if (!strcmp(options.default_backend, "merge"))
1555
- imply_merge(&options, "--merge");
1551
+ options.type = REBASE_MERGE;
1552
else if (!strcmp(options.default_backend, "apply"))
1553
options.type = REBASE_APPLY;
1554
else