mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Philippe Blain <>
To: Phillip Wood <>
Cc: Tom Rutherford <>,
	Junio C Hamano <>,
	Git mailing list <>,
	Elijah Newren <>,
Subject: Re: post-checkout hook aborts rebase
Date: Fri, 11 Sep 2020 16:25:28 -0400	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

Hello everyone,

> Le 9 sept. 2020 à 05:43, Phillip Wood <> a écrit :
> Hi Tom
> On 27/08/2020 01:44, Tom Rutherford wrote:
>> Thank you for the response Junio.
>> For what it's worth, my hook does not make changes to the repo. It's
>> running a command to check that the installed version of our
>> dependencies match the version specified in the commit being checked
>> out, and merely warns if the two don't match (then exits with a
>> nonzero return code).
>> For this reason it's been convenient that the hook runs during
>> rebases, but I find it surprising that the nonzero return code would
>> impact the rebase.
> If the checkout succeeds that rebase does not print any of checkout's
> output so unfortunately you wouldn't see the message from your hook.

According to git-rebase's doc [1], that's true only for the new "merge" backend,
though, (which would be in use here in 2.28 unless 'rebase.backend' is set to 'apply').

On a slightly related note, I noticed that that part of the documentation is not 100% exact. I states:
"Further, both backends only call the post-checkout hook with the starting point commit of the rebase, 
not the intermediate commits nor the final commit."

but I noticed that in an interactive rebase, the post-checkout hook *is* called for commits
marked as "edit", when the rebase stops to edit them (I haven't checked if it's called when the rebase stops
for other reasons, like conflicts.)

Maybe we should tweak the wording of the doc  ?




  parent reply	other threads:[~2020-09-11 20:25 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-26 23:10 post-checkout hook aborts rebase Tom Rutherford
2020-08-27  0:13 ` Junio C Hamano
2020-08-27  0:22   ` Junio C Hamano
2020-08-27  0:44     ` Tom Rutherford
2020-08-27  5:44       ` Chris Torek
2020-08-27 15:51         ` Junio C Hamano
2020-08-27 19:04           ` Chris Torek
2020-08-27 20:11             ` Elijah Newren
2020-08-27 20:32               ` Chris Torek
2020-09-09  9:43       ` Phillip Wood
2020-09-09 16:07         ` Tom Rutherford
2020-09-11 20:25         ` Philippe Blain [this message]
2020-09-12  0:51           ` Junio C Hamano
2020-08-27 16:27     ` Elijah Newren
2020-08-27 17:27       ` Junio C Hamano
2020-08-27 17:47         ` Elijah Newren

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \

* 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

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).