From: Jeff King <peff@peff.net>
To: Chris Packham <judge.packham@gmail.com>
Cc: git@vger.kernel.org, mah@jump-ing.de, jacob.keller@gmail.com,
gitster@pobox.com
Subject: Re: [PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit'
Date: Wed, 14 Dec 2016 10:20:39 -0500 [thread overview]
Message-ID: <20161214152039.swtll7xrmcdwz7bc@sigill.intra.peff.net> (raw)
In-Reply-To: <20161214083757.26412-1-judge.packham@gmail.com>
On Wed, Dec 14, 2016 at 09:37:55PM +1300, Chris Packham wrote:
> + if (continue_current_merge) {
> + int nargc = 1;
> + const char *nargv[] = {"commit", NULL};
> +
> + if (orig_argc != 2)
> + usage_msg_opt("--continue expects no arguments",
> + builtin_merge_usage, builtin_merge_options);
This message should probably be inside a _() for translation.
I noticed when running it that the output looks funny:
$ git merge --continue foo
--continue expects no arguments
usage: [...]
I was going to suggest adding something like "fatal:" here, but I
actually think it should be the responsibility of usage_msg_opt().
Looking at its other callers, they would all benefit. I posted a
patch:
http://public-inbox.org/git/20161214151009.4wdzjb44f6aki5ug@sigill.intra.peff.net/
I also wondered what it would look like to support "--quiet" on top of
this. I don't care that much about it in particular, but I just want to
make sure we're not painting ourselves into a corner.
Here's what I came up with;
diff --git a/builtin/merge.c b/builtin/merge.c
index 668aaffb8..b13523ce9 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1160,10 +1160,16 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
show_progress = 0;
if (abort_current_merge) {
- int nargc = 2;
- const char *nargv[] = {"reset", "--merge", NULL};
+ int acceptable_arguments = 2; /* argv[0] plus --abort */
+ struct argv_array nargv = ARGV_ARRAY_INIT;
- if (orig_argc != 2)
+ argv_array_pushl(&nargv, "reset", "--merge", NULL);
+ if (verbosity < 0) {
+ acceptable_arguments++;
+ argv_array_push(&nargv, "--quiet");
+ }
+
+ if (orig_argc != acceptable_arguments)
usage_msg_opt("--abort expects no arguments",
builtin_merge_usage, builtin_merge_options);
@@ -1171,15 +1177,22 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
die(_("There is no merge to abort (MERGE_HEAD missing)."));
/* Invoke 'git reset --merge' */
- ret = cmd_reset(nargc, nargv, prefix);
+ ret = cmd_reset(nargv.argc, nargv.argv, prefix);
+ argv_array_clear(&nargv);
goto done;
}
if (continue_current_merge) {
- int nargc = 1;
- const char *nargv[] = {"commit", NULL};
+ int acceptable_arguments = 2; /* argv[0] plus --abort */
+ struct argv_array nargv = ARGV_ARRAY_INIT;
+
+ argv_array_push(&nargv, "commit");
+ if (verbosity < 0) {
+ acceptable_arguments++;
+ argv_array_push(&nargv, "--quiet");
+ }
- if (orig_argc != 2)
+ if (orig_argc != acceptable_arguments)
usage_msg_opt("--continue expects no arguments",
builtin_merge_usage, builtin_merge_options);
@@ -1187,7 +1200,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
die(_("There is no merge in progress (MERGE_HEAD missing)."));
/* Invoke 'git commit' */
- ret = cmd_commit(nargc, nargv, prefix);
+ ret = cmd_commit(nargv.argc, nargv.argv, prefix);
+ argv_array_clear(&nargv);
goto done;
}
So not too bad (and you could probably refactor it to avoid some of the
duplication). Though it does get some obscure cases wrong, like:
git merge --continue --verbose --quiet
I dunno. Maybe I am leading you down a rabbit hole, and we should just
live with silently ignoring useless options. I looked at what
cherry-pick does for this case, and its verify_opt_compatible is
somewhat scary from a maintenance standpoint. It's a whitelist, not a
blacklist, so it's easy to forget options (and it looks like "git
cherry-pick --abort -Sfoo" is missed, for example).
-Peff
next prev parent reply other threads:[~2016-12-14 15:21 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-09 7:57 Any interest in 'git merge --continue' as a command Chris Packham
2016-12-09 9:11 ` Jeff King
2016-12-09 10:37 ` Jacob Keller
2016-12-09 19:16 ` Junio C Hamano
2016-12-10 8:49 ` Chris Packham
2016-12-10 9:00 ` Jeff King
2016-12-10 10:58 ` Jacob Keller
2016-12-12 8:34 ` [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit' Chris Packham
2016-12-12 9:02 ` Markus Hitter
2016-12-13 8:33 ` Chris Packham
2016-12-12 9:40 ` Jeff King
2016-12-13 8:48 ` [PATCHv2 1/2] " Chris Packham
2016-12-13 8:48 ` [PATCHv2 2/2] completion: add --continue option for merge Chris Packham
2016-12-13 11:59 ` [PATCHv2 1/2] merge: Add '--continue' option as a synonym for 'git commit' Jeff King
2016-12-13 18:02 ` Junio C Hamano
2016-12-14 8:37 ` [PATCHv3 1/3] " Chris Packham
2016-12-14 8:37 ` [PATCH 2/3] completion: add --continue option for merge Chris Packham
2016-12-14 8:37 ` [PATCH 3/3] merge: Ensure '--abort' option takes no arguments Chris Packham
2016-12-14 15:20 ` Jeff King [this message]
2016-12-14 17:01 ` [PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit' Junio C Hamano
2016-12-14 18:04 ` Junio C Hamano
2016-12-15 7:29 ` Chris Packham
2016-12-15 17:36 ` Junio C Hamano
2016-12-15 17:43 ` Jeff King
2016-12-10 8:59 ` Any interest in 'git merge --continue' as a command Jeff King
2016-12-10 18:16 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161214152039.swtll7xrmcdwz7bc@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=judge.packham@gmail.com \
--cc=mah@jump-ing.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).