From: Junio C Hamano <gitster@pobox.com>
To: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Cc: git@vger.kernel.org
Subject: Re: pre-push hook does not get input on non-fast-forward pushes
Date: Mon, 28 Mar 2016 14:44:20 -0700 [thread overview]
Message-ID: <xmqq1t6uxop7.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <201603282056.u2SKuqDf031459@mail2.student.tuwien.ac.at> (Stefan Tauner's message of "Mon, 28 Mar 2016 22:56:52 +0200")
Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> writes:
> I noticed that without an additional --force the pre-push hook does not
> get any input on stdin if a push would result in non-fast-forward
> uploads. This is not a problem per se (although I don't get the
> rationale) but it is undocumented and the latter left me puzzled.
>
> (Please keep me in CC since I am not subscribed, thanks)
Thanks (no need to say "please cc me", as that is the norm here).
The pre-push hook is not the only thing that may prevent you from
pushing a ref update. As you noticed, non-fast-forward check may
trigger and decide that a ref is not going to be pushed, and that
may happen before we call the pre-push hook.
Information about what is to be pushed is provided on the hook's
standard input with lines of the form ...
So when the pre-push is called, the refs that will not fast-forward
may not be among the "what is to be pushed", hence not reported.
We _could_ add something like this to the documentation, but we do
not necessarily want to promise that the order of checks to stay
"internal checks like non-ff check first before pre-push hook", so
this update may not be an improvement. The current text conveys
enough information without making such a promise, but you need to
read it carefully.
So I dunno.
Documentation/githooks.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 9ef2469..605ba4d 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -201,7 +201,9 @@ does not yet exist the `<remote SHA-1>` will be 40 `0`. If a ref is to be
deleted, the `<local ref>` will be supplied as `(delete)` and the `<local
SHA-1>` will be 40 `0`. If the local commit was specified by something other
than a name which could be expanded (such as `HEAD~`, or a SHA-1) it will be
-supplied as it was originally given.
+supplied as it was originally given. A request to update remote ref that has
+already been rejected for other reasons (e.g. failing to pass a fast-forward
+test) does not appear in the input.
If this hook exits with a non-zero status, 'git push' will abort without
pushing anything. Information about why the push is rejected may be sent
next prev parent reply other threads:[~2016-03-28 21:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-28 20:56 pre-push hook does not get input on non-fast-forward pushes Stefan Tauner
2016-03-28 21:44 ` Junio C Hamano [this message]
2016-03-28 21:56 ` Stefan Beller
2016-03-28 22:09 ` Stefan Tauner
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=xmqq1t6uxop7.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=stefan.tauner@alumni.tuwien.ac.at \
/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).