git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] fixup! builtin rebase: support `--gpg-sign` option
Date: Thu, 11 Oct 2018 11:17:39 +0900	[thread overview]
Message-ID: <xmqqva69grb0.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqzhvlgref.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Thu, 11 Oct 2018 11:15:36 +0900")

Junio C Hamano <gitster@pobox.com> writes:

> 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.
>
>  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) "" },

This allows "--gpg-sign" in addition to "--gpg-sign=ARG" and stores
an empty string in place of ARG when accepting the option without
arg.  

The result in gpg_sign is used by checking if the pointer is
non-NULL and formatted with xstrfmt("-S%s", gpg_sign).

The change looks correct; will squash into what has been queued on
'pu'.

Thanks.

>  		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'"),

  reply	other threads:[~2018-10-11  2:17 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 [this message]
2018-10-12  9:38 ` Johannes Schindelin

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=xmqqva69grb0.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    /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).