Re: [PATCH v2 9/9] pull: add the --gpg-sign option.

From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Feb 1, 2014, 01:01 UTC
Message-ID: <20140201010100.GB635004@vauxhall.crustytoothpaste.net>
In-Reply-To: <xmqqlhy1m27b.fsf@gitster.dls.corp.google.com>

On Mon, Jan 27, 2014 at 03:31:36PM -0800, Junio C Hamano wrote:

Show 10 quoted lines

> 
> ... but here it is used as if it is properly quoted so that later
> "eval $eval" will take it as a single argument.
> 
> 	git pull --gpg-sign='foo bar'
> 
> will probably ask the command to use 'foo' as the signer key id,
> with 'bar' as an extra, unknown token on the command line of the
> underlying 'git merge', I suspect.  A "git rev-parse --sq-quote"
> in the earlier hunk may be all it takes to fix it.

Yes, you were correct that that was broken, and yes, it turns out that your fix is sufficient. It also happens to fix the issue where the help text is improperly quoted. With your suggested fix, it is now quoted (ugly, but quoted):

  Stopped at aba3d3ff83b59627adbdafe1b334a46ed5b7ec17... am: add the --gpg-sign option
  You can amend the commit now, with
  
  	git commit --amend  '-Sbrian m. carlson <sandals@crustytoothpaste.net>'

Since I expect most users are going to use -S, either because they have a key specifically specified in .gitconfig, or because the default key is the right thing anyway, I don't see this as a huge problem. I think I'll probably end up fixing it anyway and then send out the 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