On Mon, Jan 27, 2014 at 03:36:44PM -0800, Junio C Hamano wrote:
> "brian m. carlson" <sandals@xxxxxxxxxxxxxxxxxxxx> 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.
Thanks for the review. I'll get working on a reroll.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
Attachment:
signature.asc
Description: Digital signature