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

Merge branch 'ea/rebase-code-simplify'

Browse Source 
Code clean-up.

* ea/rebase-code-simplify:
  rebase: simplify an assignment of options.type in cmd_rebase
This commit is contained in:
Junio C Hamano 2022-05-11 13:56:22 -07:00
commit bedefc1227
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

@ -1187,11 +1187,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();
} }