rebase: simplify an assignment of options.type in cmd_rebase
There is an if statement where both if and else have the same assignment of options.type to REBASE_MERGE. Simplify it by getting that assigmnent out of the if. Signed-off-by: Edmundo Carmona Antoranz <eantoranz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Edmundo Carmona Antoranz committed
Apr 18, 2022 at 19:27 UTC
52e1ab8a7692c27c288a15da2604273b401063ac
1 file changed
+2
-4
builtin/rebase.c
+2
-4
index 36490d06c8..81c8926a56 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1159,11 +1159,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
} else {
strbuf_reset(&buf);
strbuf_addf(&buf, "%s/interactive", merge_dir());
- if(file_exists(buf.buf)) {
- options.type = REBASE_MERGE;
+ options.type = REBASE_MERGE;
+ if (file_exists(buf.buf))
options.flags |= REBASE_INTERACTIVE_EXPLICIT;
- } else
- options.type = REBASE_MERGE;
}
options.state_dir = merge_dir();
}