[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

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

2013-01-02 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com 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,

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

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

2013-01-02 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com 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,