[PATCH] Spelling: correct spelling of "passphrase"
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Nov 2 17:48:00 CET 2016
On Wed 2016-11-02 07:58:59 -0400, Justus Winter wrote:
>> diff --git a/doc/help.be.txt b/doc/help.be.txt
>> index 36c9ffb..f722b8c 100644
>> --- a/doc/help.be.txt
>> +++ b/doc/help.be.txt
>> @@ -228,7 +228,7 @@ self-signatures will be advanced by one second.
>> # fixme: Please translate and remove the hash mark from the key line.
>> -Please enter the passhrase; this is a secret sentence
>> +Please enter the passphrase; this is a secret sentence
> You are adding a line with trailing whitespace. I don't know how you
> got this past your git commit hook (I'm guessing you disabled it), but
> we also use this hook on the git server, and it does not allow me to
> push such a commit. So I had to amend your patch accordingly, and I
> remember that I had to do so in the past. So *please* enable that hook
> that checks for these mistakes.
Hm, sorry, it looks like i'd commented out that check in my pre-commit
hook, probably because i need to commit patches to other branches of my
git repo (for debian packaging purposes), and a patch which includes an
empty context line will invariably have trailing whitespace (the full
line looks like " "). I'll try to adjust the check to limit this
allowance to those branches where i need to commit patches.
I also note that the original (replaced) line itself had trailing
whitespace. If the goal is no trailing whitespace, and you want people
to enforce this, perhaps it'd be worthwhile to do a global trailing
thanks for the merges!
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 930 bytes
Desc: not available
More information about the Gnupg-devel