[PATCH] revert: clarify seemingly bogus OPT_END repetition
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 5, 2016, 11:58 UTC
- Message-ID
- <5b424bad41ca027b39eea4b1fa9d87df0a489e0f.1467719888.git.johannes.schindelin@gmx.de>
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