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>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 36490d06c8ac6ad4c10596b7e2a4556ec7aaa8c8..81c8926a56691a252f708a8553304215178ee0ef 100644 (file)
--- 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();
        }