* [PATCH] merge: simplify code flow
@ 2015-04-23 20:01 Junio C Hamano
2015-04-23 20:10 ` Jeff King
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2015-04-23 20:01 UTC (permalink / raw)
To: git
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 3b0f8f9..0ab7142 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1158,15 +1158,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);
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] merge: simplify code flow
2015-04-23 20:01 [PATCH] merge: simplify code flow Junio C Hamano
@ 2015-04-23 20:10 ` Jeff King
2015-04-23 20:15 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Jeff King @ 2015-04-23 20:10 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Thu, Apr 23, 2015 at 01:01:44PM -0700, Junio C Hamano wrote:
> 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>
Yeah, this looks obviously correct.
As an aside, the fact that the actual "if (abort_current_merge)"
conditional ends with a "goto" to a cleanup label that is 500 lines away
is...kind of gross.
-Peff
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] merge: simplify code flow
2015-04-23 20:10 ` Jeff King
@ 2015-04-23 20:15 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2015-04-23 20:15 UTC (permalink / raw)
To: Jeff King; +Cc: git
Jeff King <peff@peff•net> writes:
> Yeah, this looks obviously correct.
It is funny that this dates back to the very beginning of defaulting
to the upstream, the code that "if ()" block implements, introduced
at 93e535a5 (merge: merge with the default upstream branch without
argument, 2011-03-23).
> As an aside, the fact that the actual "if (abort_current_merge)"
> conditional ends with a "goto" to a cleanup label that is 500 lines away
> is...kind of gross.
Reading "git show 93e535a5" output, I see that it is a more recent
"breakage" ;-)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-23 20:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-23 20:01 [PATCH] merge: simplify code flow Junio C Hamano
2015-04-23 20:10 ` Jeff King
2015-04-23 20:15 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox