From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Apr 2015 20:01:44 +0000 (-0700)
Subject: merge: simplify code flow
X-Git-Tag: v2.5.0-rc0~107^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00c7e7e7e8a2aa07b2cd3a09c8f9e11872727d86;p=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>
---

diff --git a/builtin/merge.c b/builtin/merge.c
index bebbe5b308..8477878442 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);