From: Jonathan Nieder Date: Thu, 08 Mar 2012 12:21:55 GMT Subject: [PATCH] pre-rebase hook: capture documentation in a < In-Reply-To: <7vmxc6xs73.fsf@alter.siamese.dyndns.org> Without this change, the sample hook does not pass a syntax check (sh -n): $ sh -n hooks--pre-rebase.sample hooks--pre-rebase.sample: line 101: syntax error near unexpected token `(' hooks--pre-rebase.sample: line 101: ` merged into it again (either directly or indirectly).' Signed-off-by: Jonathan Nieder Improved-by: Junio C Hamano --- Junio C Hamano wrote: > Jonathan Nieder writes: >> pre-rebase hook: capture documentation in a < > I do not mind this but if you are to do so you should remove the "exit 0" > before that block. Done. ;) Thanks, and sorry for the slow reply. Jonathan templates/hooks--pre-rebase.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample index 053f1111..b7f81c19 100755 --- a/templates/hooks--pre-rebase.sample +++ b/templates/hooks--pre-rebase.sample @@ -88,9 +88,7 @@ else exit 1 fi -exit 0 - -################################################################ +<<\DOC_END This sample hook safeguards topic branches that have been published from being rewound. @@ -167,3 +165,5 @@ To compute (2): git rev-list master..topic if this is empty, it is fully merged to "master". + +DOC_END -- 1.7.9.2