public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: "brian m. carlson" <sandals@crustytoothpaste•net>
Cc: git@vger•kernel.org, Nicolas Vigier <boklm@mars-attacks•org>
Subject: Re: [PATCH v2 8/9] rebase: add the --gpg-sign option
Date: Mon, 27 Jan 2014 15:36:44 -0800	[thread overview]
Message-ID: <xmqqha8pm1yr.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1390524666-51274-9-git-send-email-sandals@crustytoothpaste.net> (brian m. carlson's message of "Fri, 24 Jan 2014 00:51:05 +0000")

"brian m. carlson" <sandals@crustytoothpaste•net> writes:

> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 43c19e0..73d32dd 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -181,7 +181,7 @@ exit_with_patch () {
>  	git rev-parse --verify HEAD > "$amend"
>  	warn "You can amend the commit now, with"
>  	warn
> -	warn "	git commit --amend"
> +	warn "	git commit --amend $gpg_sign_opt"

I think this is meant to be cut-&-pasted, so you may have to quote
the RHS of --gpg-sign=<key> (or the key part of -S<key>).

The same comment as the one for 'git pull' patch applies around
'eval's in the remainder of the patch.

> @@ -248,7 +248,8 @@ pick_one () {
>  
>  	test -d "$rewritten" &&
>  		pick_one_preserving_merges "$@" && return
> -	output eval git cherry-pick "$strategy_args" $empty_args $ff "$@"
> +	output eval git cherry-pick ${gpg_sign_opt:+"$gpg_sign_opt"} \
> +			"$strategy_args" $empty_args $ff "$@"
>  }
> [rest snipped]

Thanks.

next prev parent reply	other threads:[~2014-01-27 23:36 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-24  0:50 [PATCH v2 0/9] add --gpg-sign to rebase and pull brian m. carlson
2014-01-24  0:50 ` [PATCH v2 1/9] cherry-pick, revert: add the --gpg-sign option brian m. carlson
2014-01-24 21:00   ` Junio C Hamano
2014-01-24 21:08     ` brian m. carlson
2014-01-24 22:45       ` Junio C Hamano
2014-01-24  0:50 ` [PATCH v2 2/9] git-sh-setup.sh: add variable to use the stuck-long mode brian m. carlson
2014-01-27 23:21   ` Junio C Hamano
2014-01-24  0:51 ` [PATCH v2 3/9] am: parse options in " brian m. carlson
2014-01-24  0:51 ` [PATCH v2 4/9] am: add the --gpg-sign option brian m. carlson
2014-01-27 23:26   ` Junio C Hamano
2014-01-24  0:51 ` [PATCH v2 5/9] rebase: remove useless arguments check brian m. carlson
2014-01-24  0:51 ` [PATCH v2 6/9] rebase: don't try to match -M option brian m. carlson
2014-01-24  0:51 ` [PATCH v2 7/9] rebase: parse options in stuck-long mode brian m. carlson
2014-01-24  0:51 ` [PATCH v2 8/9] rebase: add the --gpg-sign option brian m. carlson
2014-01-27 23:36   ` Junio C Hamano [this message]
2014-01-27 23:59     ` brian m. carlson
2014-01-24  0:51 ` [PATCH v2 9/9] pull: " brian m. carlson
2014-01-27 23:31   ` Junio C Hamano
2014-02-01  1:01     ` brian m. carlson
2014-02-03 18:04       ` Junio C Hamano
2014-01-24  9:14 ` [PATCH v2 0/9] add --gpg-sign to rebase and pull Nicolas Vigier
2014-01-24 20:06   ` Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqha8pm1yr.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=boklm@mars-attacks$(echo .)org \
    --cc=git@vger$(echo .)kernel.org \
    --cc=sandals@crustytoothpaste$(echo .)net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox