Re: [PATCH] hooks: replace irrelevant hook sample

2017-07-07 Thread Kaartic Sivaraam
On Fri, 2017-07-07 at 08:05 -0700, Junio C Hamano wrote: > That is because I wear multiple hats, because I try to help in > different ways, and because open source is not a battle to see whose > idea is more right, but is a cooperative process to find a better > solution together. > Thanks for hel

Re: [PATCH] hooks: replace irrelevant hook sample

2017-07-07 Thread Junio C Hamano
Kaartic Sivaraam writes: > That said, in case my interpretation that "'prepare-commit-msg' hook is > not to be shipped due to it's uselessness" is correct, the reply of > this mail as a whole seems to contradict it. That is because I wear multiple hats, because I try to help in different ways, a

Re: [PATCH] hooks: replace irrelevant hook sample

2017-07-07 Thread Kaartic Sivaraam
On Wed, 2017-07-05 at 12:50 -0700, Junio C Hamano wrote: > Three things that caught my eyes: > >  - Between "git commit --cleanup=strip" and "git commit -- > cleanup=verbatim", >    lines that make up this initial instruction section are different. > >  - "git grep 'Please enter the '" finds that

Re: [PATCH] hooks: replace irrelevant hook sample

2017-07-05 Thread Junio C Hamano
Kaartic Sivaraam writes: > +sed -e '/^# Please enter the .*/ { > + N > + N > + d > +}' "$1" >'.sed-output.temp' && mv '.sed-output.temp' "$1" Three things that caught my eyes: - Between "git commit --cleanup=strip" and "git commit --cleanup=verbatim", lines that make up this initial inst

[PATCH] hooks: replace irrelevant hook sample

2017-07-05 Thread Kaartic Sivaraam
The pre-commit-msg hook sample has an example that comments the "Conflicts:" part of the merge commmit. It isn't relevant anymore as it's done by default since 261f315b ("merge & sequencer: turn "Conflicts:" hint into a comment", 2014-08-28). Add an alternative example that replaces it. This ensur