Re: [PATCH] merge: Honor prepare-commit-msg return code

2013-01-03 Thread Antoine Pelisse
> Oh, that wasn't meant as a complaint. I am tempted to rewrite the > log message like so, though: > > 65969d4 (merge: honor prepare-commit-msg hook, 2011-02-14) tried to > make "git commit" and "git merge" consistent, because a merge that > required user assistance has to be concluded

Re: [PATCH] merge: Honor prepare-commit-msg return code

2013-01-02 Thread Junio C Hamano
Antoine Pelisse writes: >>> prepare-commit-msg hook is run when committing to prepare the log >>> message. If the exit-status is non-zero, the commit should be aborted. >> >> I was scratching my head why you CC'ed Jay, until I dug up 65969d4 >> (merge: honor prepare-commit-msg hook, 2011-02-14).

Re: [PATCH] merge: Honor prepare-commit-msg return code

2013-01-02 Thread Antoine Pelisse
>> prepare-commit-msg hook is run when committing to prepare the log >> message. If the exit-status is non-zero, the commit should be aborted. > > I was scratching my head why you CC'ed Jay, until I dug up 65969d4 > (merge: honor prepare-commit-msg hook, 2011-02-14). I did as suggested in "Submitt

Re: [PATCH] merge: Honor prepare-commit-msg return code

2013-01-02 Thread Junio C Hamano
Antoine Pelisse writes: > prepare-commit-msg hook is run when committing to prepare the log > message. If the exit-status is non-zero, the commit should be aborted. I was scratching my head why you CC'ed Jay, until I dug up 65969d4 (merge: honor prepare-commit-msg hook, 2011-02-14). > +test_exp

Re: [PATCH] merge: Honor prepare-commit-msg return code

2013-01-02 Thread Antoine Pelisse
On Wed, Jan 2, 2013 at 7:42 PM, Antoine Pelisse wrote: > prepare-commit-msg hook is run when committing to prepare the log > message. If the exit-status is non-zero, the commit should be aborted. > > While the script is run before committing a successful merge, the > exit-status is ignored and a n

[PATCH] merge: Honor prepare-commit-msg return code

2013-01-02 Thread Antoine Pelisse
prepare-commit-msg hook is run when committing to prepare the log message. If the exit-status is non-zero, the commit should be aborted. While the script is run before committing a successful merge, the exit-status is ignored and a non-zero exit doesn't abort the commit. Abort the commit if prepa