mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
d516b2db0a
commit
52e1ab8a76
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue