Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-30 Thread Junio C Hamano
Mark Levedahl mleved...@gmail.com writes: On 11/28/2014 12:18 AM, Jeff King wrote: Thanks for the links; I had no recollection of that thread. Unsurprisingly, I like the HEAD/HEAD~1 suggestion. That peff guy seems really clever (and handsome, too, I'll bet). I'd still be OK with any of the

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-28 Thread Mark Levedahl
On 11/28/2014 12:18 AM, Jeff King wrote: On Thu, Nov 27, 2014 at 09:40:08AM -0500, Mark Levedahl wrote: Then when you add new arguments, the hook has to search through the parameters looking for one that matches, rather than just checking $1 for amend (and $2 for the new option, and so on). As

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-27 Thread Mark Levedahl
On 11/25/2014 12:03 AM, Jeff King wrote: On Mon, Nov 24, 2014 at 08:58:37PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: 1. It is a bit more obvious when debugging or dumping arguments (e.g., via GIT_TRACE), especially if new options are added after the first.

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-27 Thread Jeff King
On Thu, Nov 27, 2014 at 09:40:08AM -0500, Mark Levedahl wrote: Then when you add new arguments, the hook has to search through the parameters looking for one that matches, rather than just checking $1 for amend (and $2 for the new option, and so on). As long as the set of options remains

[PATCH] commit: inform pre-commit if --amend is used

2014-11-24 Thread Øystein Walle
When a commit is amended a pre-commit hook that verifies the commit's contents might not find what it's looking for if for example it looks at the differences against HEAD when HEAD~1 might be more appropriate. Inform the commit hook that --amend is being used so that hook authors can do e.g.

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-24 Thread Eric Sunshine
On Mon, Nov 24, 2014 at 6:21 AM, Øystein Walle oys...@gmail.com wrote: When a commit is amended a pre-commit hook that verifies the commit's contents might not find what it's looking for if for example it looks at the differences against HEAD when HEAD~1 might be more appropriate. Inform the

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-24 Thread Jeff King
On Mon, Nov 24, 2014 at 12:21:51PM +0100, Øystein Walle wrote: This hook is invoked by 'git commit', and can be bypassed -with `--no-verify` option. It takes no parameter, and is +with `--no-verify` option. It takes one parameter which is amend if +`--amend` was used when committing and

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-24 Thread Junio C Hamano
Jeff King p...@peff.net writes: 1. It is a bit more obvious when debugging or dumping arguments (e.g., via GIT_TRACE), especially if new options are added after the first. 2. It makes it easier for a script to work on old and new versions of git. It sees either amend or

Re: [PATCH] commit: inform pre-commit if --amend is used

2014-11-24 Thread Jeff King
On Mon, Nov 24, 2014 at 08:58:37PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: 1. It is a bit more obvious when debugging or dumping arguments (e.g., via GIT_TRACE), especially if new options are added after the first. 2. It makes it easier for a script