From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] revert: clarify seemingly bogus OPT_END repetition
Date: Tue, 5 Jul 2016 13:58:51 +0200 (CEST) [thread overview]
Message-ID: <5b424bad41ca027b39eea4b1fa9d87df0a489e0f.1467719888.git.johannes.schindelin@gmx.de> (raw)
This developer stumbled over repeated OPT_END entries and was *so
close* (almost touches his thumb with his index finger) to collapse
them into a single one. Only inspecting the file's history with
`git log -p -SOPT_END` clarified why they are there.
This confusion can be easily prevented by inserting a simple and
clear comment.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Another patch from the rebase--helper queue.
Published-As: https://github.com/dscho/git/releases/tag/clarify-opt-end-v1
builtin/revert.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/builtin/revert.c b/builtin/revert.c
index 56a2c36..b4da1f6 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -92,6 +92,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts)
{ OPTION_STRING, 'S', "gpg-sign", &opts->gpg_sign, N_("key-id"),
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_END(),
+ /* place-holders for REPLAY_PICK's extra options, see below */
OPT_END(),
OPT_END(),
OPT_END(),
--
2.9.0.280.g32e2a70
base-commit: cf4c2cfe52be5bd973a4838f73a35d3959ce2f43
next reply other threads:[~2016-07-05 11:59 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-05 11:58 Johannes Schindelin [this message]
2016-07-05 20:28 ` [PATCH] revert: clarify seemingly bogus OPT_END repetition Jeff King
2016-07-05 20:44 ` Jeff King
2016-07-05 21:15 ` Jacob Keller
2016-07-06 7:01 ` Johannes Schindelin
2016-07-06 11:09 ` Michael J Gruber
2016-07-06 13:16 ` Over-/underquoting, was " Johannes Schindelin
2016-07-06 20:15 ` Jacob Keller
2016-07-09 15:34 ` Michael J Gruber
2016-07-09 23:35 ` Eric Wong
2016-07-06 7:28 ` Johannes Schindelin
2016-07-06 7:03 ` Johannes Schindelin
2016-07-06 10:48 ` Jeff King
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=5b424bad41ca027b39eea4b1fa9d87df0a489e0f.1467719888.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).