mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: simplify code flow

Browse Source 
One of the first things cmd_merge() does is to see if the "--abort"
option is given and run "reset --merge" and exit.  When the control
reaches this point, we know "--abort" was not given.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2015-04-23 13:01:44 -07:00
parent 9e62316df7
commit 00c7e7e7e8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/merge.c
View File

@ -1165,15 +1165,15 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
option_commit = 0; option_commit = 0;
} }
if (!abort_current_merge) { if (!argc) {
if (!argc) { if (default_to_upstream)
if (default_to_upstream) argc = setup_with_upstream(&argv);
argc = setup_with_upstream(&argv); else
else die(_("No commit specified and merge.defaultToUpstream not set."));
die(_("No commit specified and merge.defaultToUpstream not set.")); } else if (argc == 1 && !strcmp(argv[0], "-")) {
} else if (argc == 1 && !strcmp(argv[0], "-")) argv[0] = "@{-1}";
argv[0] = "@{-1}";
} }
if (!argc) if (!argc)
usage_with_options(builtin_merge_usage, usage_with_options(builtin_merge_usage,
builtin_merge_options); builtin_merge_options);