Re: [PATCH] merge: Run commit-msg hook

2016-07-27 Thread Johannes Schindelin
Hi Orgad, On Tue, 26 Jul 2016, Orgad Shaneh wrote: > On Tue, Jul 26, 2016 at 5:54 PM, Johannes Schindelin < > johannes.schinde...@gmx.de> wrote: > > > On Tue, 26 Jul 2016, Orgad Shaneh wrote: > > > > > On Tue, Jul 26, 2016 at 4:02 PM, Johannes Schindelin > > > wrote: > > > > > > > > On Tue, 26

Re: [PATCH] merge: Run commit-msg hook

2016-07-26 Thread Junio C Hamano
Johannes Schindelin writes: > FWIW I dug out the original submission: > http://thread.gmane.org/gmane.comp.version-control.git/151297/focus=151435 > > It seems that there was no discussion about the commit-msg. Which makes me > wonder why nobody thought of this. I actually think it was a mistake

Re: [PATCH] merge: Run commit-msg hook

2016-07-26 Thread Junio C Hamano
Orgad Shaneh writes: >> Hmm. This is not very convincing to me, as >> >> - if you call commit-msg in `git merge` now, why not `prepare-commit-msg`? > > prepare-commit-msg is already called, a few lines above this addition. I do not see such call in contrib/example/git-merge.sh; could it be a rec

[PATCH] merge: Run commit-msg hook

2016-07-26 Thread Orgad Shaneh
Hi again, On Tue, Jul 26, 2016 at 5:54 PM, Johannes Schindelin wrote: > > Hi Orgad, > > On Tue, 26 Jul 2016, Orgad Shaneh wrote: > > > On Tue, Jul 26, 2016 at 4:02 PM, Johannes Schindelin > > wrote: > > > > > > On Tue, 26 Jul 2016, Orgad Shaneh wrote: > > > > > >> commit-msg is needed to either

Re: [PATCH] merge: Run commit-msg hook

2016-07-26 Thread Johannes Schindelin
Hi Orgad, On Tue, 26 Jul 2016, Orgad Shaneh wrote: > On Tue, Jul 26, 2016 at 4:02 PM, Johannes Schindelin > wrote: > > > > On Tue, 26 Jul 2016, Orgad Shaneh wrote: > > > >> commit-msg is needed to either validate the commit message or edit it. > >> Gerrit for instance uses this hook to append it

Re: [PATCH] merge: Run commit-msg hook

2016-07-26 Thread Orgad Shaneh
Hi, On Tue, Jul 26, 2016 at 4:02 PM, Johannes Schindelin wrote: > Hi Orgad, > > On Tue, 26 Jul 2016, Orgad Shaneh wrote: > >> From: Orgad Shaneh > > Again, this is unnecessary if you already send the mail from the same > address. > >> commit-msg is needed to either validate the commit message or

Re: [PATCH] merge: Run commit-msg hook

2016-07-26 Thread Johannes Schindelin
Hi Orgad, On Tue, 26 Jul 2016, Orgad Shaneh wrote: > From: Orgad Shaneh Again, this is unnecessary if you already send the mail from the same address. > commit-msg is needed to either validate the commit message or edit it. > Gerrit for instance uses this hook to append its Change-Id footer. >

[PATCH] merge: Run commit-msg hook

2016-07-26 Thread Orgad Shaneh
From: Orgad Shaneh commit-msg is needed to either validate the commit message or edit it. Gerrit for instance uses this hook to append its Change-Id footer. This is relevant to merge commit just like any other commit. Signed-off-by: Orgad Shaneh --- Documentation/git-merge.txt | 6 +- bui