undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: simplify an assignment of options.type in cmd_rebase

Browse Source 
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:
Edmundo Carmona Antoranz 2022-04-18 19:27:21 +02:00 committed by Junio C Hamano
parent d516b2db0a
commit 52e1ab8a76
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/rebase.c
View File

@ -1159,11 +1159,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
} else { } else {
strbuf_reset(&buf); strbuf_reset(&buf);
strbuf_addf(&buf, "%s/interactive", merge_dir()); 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; options.flags |= REBASE_INTERACTIVE_EXPLICIT;
} else
options.type = REBASE_MERGE;
} }
options.state_dir = merge_dir(); options.state_dir = merge_dir();
} }