[PATCH v2 02/15] merge: simplify code flow
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 29, 2015, 21:29 UTC
- Message-ID
- <1430342973-30344-3-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1430342973-30344-1-git-send-email-gitster@pobox.com>
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> --- builtin/merge.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c index bebbe5b..8477878 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -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);
-- 2.4.0-rc3-300-g052d062