rebase: simplify an assignment of options.type in cmd_rebase
PATCH v2 1/1 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 <[email protected]>
---
Range-diff:
1: 7b6483fcce ! 1: 959aff8b8e rebase: simplify an assignment of options.type in cmd_rebase
@@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix
- if(file_exists(buf.buf)) {
- options.type = REBASE_MERGE;
+ options.type = REBASE_MERGE;
-+ if(file_exists(buf.buf))
++ if (file_exists(buf.buf))
options.flags |= REBASE_INTERACTIVE_EXPLICIT;
- } else
- options.type = REBASE_MERGE;builtin/rebase.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
builtin/rebase.c +2 -4
@@ -1187,11 +1187,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 (); }
Signature · 1 line
2.35.1