зеркало из https://github.com/microsoft/git.git
merge: simplify code flow
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:
Родитель
9e62316df7
Коммит
00c7e7e7e8
|
@ -1165,15 +1165,15 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
|
|||
option_commit = 0;
|
||||
}
|
||||
|
||||
if (!abort_current_merge) {
|
||||
if (!argc) {
|
||||
if (default_to_upstream)
|
||||
argc = setup_with_upstream(&argv);
|
||||
else
|
||||
die(_("No commit specified and merge.defaultToUpstream not set."));
|
||||
} else if (argc == 1 && !strcmp(argv[0], "-"))
|
||||
argv[0] = "@{-1}";
|
||||
if (!argc) {
|
||||
if (default_to_upstream)
|
||||
argc = setup_with_upstream(&argv);
|
||||
else
|
||||
die(_("No commit specified and merge.defaultToUpstream not set."));
|
||||
} else if (argc == 1 && !strcmp(argv[0], "-")) {
|
||||
argv[0] = "@{-1}";
|
||||
}
|
||||
|
||||
if (!argc)
|
||||
usage_with_options(builtin_merge_usage,
|
||||
builtin_merge_options);
|
||||
|
|
Загрузка…
Ссылка в новой задаче