From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Jonathan Nieder <jrnieder@gmail.com>,
Stefan Beller <sbeller@google.com>
Subject: pre-rebase hook: capture documentation in a <<here document
Date: Mon, 10 Jul 2017 16:35:25 -0700 [thread overview]
Message-ID: <20170710233525.11650-1-sbeller@google.com> (raw)
From: Jonathan Nieder <jrnieder@gmail.com>
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>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
Junio wrote in "What's-cooking":
> ... I do not know how well they are tested
> in the field by people using 'master' in their everyday workflow.
> Ideally, our release process wants to see more people using 'next'
> in their everyday workflow to keep 'master' more stable than any
> tagged release, but I do not have a good idea on how to encourage
> it more than we currently do.
Our internal release of git @ Google is debian experimental,
which is basically the 'next' branch + this patch + another patch.
AFAICT It is a resend of
https://public-inbox.org/git/20120308122105.GA1562@burratino/
As Jonathan is a Debian Developer, it is easy for us to base
our internal version onto debian experimental, but long term we may
want to base our internal version on the original next. :)
To do so, upstream this one last meaningful patch.
The 'another patch' from above is changing and hardcoding
the version number, which we do not want to upstream.
Thanks,
Stefan
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 053f111..b7f81c1 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.8.5.3
next reply other threads:[~2017-07-10 23:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-10 23:35 Stefan Beller [this message]
2017-07-11 0:15 ` pre-rebase hook: capture documentation in a <<here document brian m. carlson
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=20170710233525.11650-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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).