From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Ben Walton <bwalton@artsci.utoronto.ca>
Subject: [PATCH] pre-rebase hook: capture documentation in a <<here document
Date: Thu, 8 Mar 2012 06:21:55 -0600 [thread overview]
Message-ID: <20120308122105.GA1562@burratino> (raw)
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 <jrnieder@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
---
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>> pre-rebase hook: capture documentation in a <<here document [4]
>
> 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
next prev parent reply other threads:[~2012-03-08 12:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-08 9:02 [fyi] patches used by git distributors Jonathan Nieder
2011-11-08 20:41 ` Junio C Hamano
2011-11-08 20:45 ` Junio C Hamano
2012-03-08 12:21 ` Jonathan Nieder [this message]
2011-11-10 12:07 ` Erik Faye-Lund
2011-11-10 16:12 ` Todd Zullinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120308122105.GA1562@burratino \
--to=jrnieder@gmail.com \
--cc=bwalton@artsci.utoronto.ca \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).