From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] fixup! builtin rebase: support `--gpg-sign` option
Date: Fri, 12 Oct 2018 11:38:58 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1810121138310.45@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqzhvlgref.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Thu, 11 Oct 2018, Junio C Hamano wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> Date: Thu, 27 Sep 2018 14:48:17 +0200
>
> The `--gpg-sign` option takes an *optional* argument, not a mandatory
> one.
>
> This was discovered as part of the investigation of
> https://github.com/git-for-windows/git/issues/1836.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>
> * I am sending this out as I want to mimize the number of
> non-trivial changes that come into my tree without hitting the
> list archive.
Thanks, *much* appreciated.
Ciao,
Dscho
>
> builtin/rebase.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index a28bfbd62f..43bc6f7915 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1030,8 +1030,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> OPT_BOOL(0, "autosquash", &options.autosquash,
> N_("move commits that begin with "
> "squash!/fixup! under -i")),
> - OPT_STRING('S', "gpg-sign", &gpg_sign,
> - N_("gpg-sign?"), N_("GPG-sign commits")),
> + { OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
> + N_("GPG-sign commits"),
> + PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
> OPT_STRING_LIST(0, "whitespace", &whitespace,
> N_("whitespace"), N_("passed to 'git apply'")),
> OPT_SET_INT('C', 0, &opt_c, N_("passed to 'git apply'"),
> --
> 2.19.1-328-g5a0cc8aca7
>
>
prev parent reply other threads:[~2018-10-12 9:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 2:15 [PATCH] fixup! builtin rebase: support `--gpg-sign` option Junio C Hamano
2018-10-11 2:17 ` Junio C Hamano
2018-10-12 9:38 ` Johannes Schindelin [this message]
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=nycvar.QRO.7.76.6.1810121138310.45@tvgsbejvaqbjf.bet \
--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).