diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-11 23:56:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-11 23:56:22 +0300 |
| commit | bedefc1227907a4bfdf508bc1128d3c0813e5f82 (patch) | |
| tree | 7af3076960aadb98fe74ff107fab23c184164d53 /builtin | |
| parent | 4c5d5e1b72cc22446df664007bed533ad2e1efd3 (diff) | |
| parent | 52e1ab8a7692c27c288a15da2604273b401063ac (diff) | |
Merge branch 'ea/rebase-code-simplify'
Code clean-up.
* ea/rebase-code-simplify:
rebase: simplify an assignment of options.type in cmd_rebase
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 7f3bffc0a2..7ab50cda2a 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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(); } |