From ddb6e5ca19d5cdd318bc4bcbb7f7f3fb0892c8cc Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 27 Sep 2018 15:01:01 +0200 Subject: [PATCH] fixup! rebase -i: implement the main part of interactive rebase as a builtin The `--gpg-sign` option takes an *optional* argument, not a mandatory one. This fixes https://github.com/git-for-windows/git/issues/1836. Signed-off-by: Johannes Schindelin --- builtin/rebase--interactive.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index 551faba558..4b9d2a07cb 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -181,8 +181,9 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) OPT_STRING(0, "upstream", &upstream, N_("upstream"), N_("the upstream commit")), OPT_STRING(0, "head-name", &head_name, N_("head-name"), N_("head name")), - OPT_STRING('S', "gpg-sign", &opts.gpg_sign, N_("gpg-sign"), - N_("GPG-sign commits")), + { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign, N_("key-id"), + N_("GPG-sign commits"), + PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"), N_("rebase strategy")), OPT_STRING(0, "strategy-opts", &raw_strategies, N_("strategy-opts"),