From: Phillip Wood <phillip.wood123@gmail.com>
To: Tom Rutherford <tmrutherford@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: post-checkout hook aborts rebase
Date: Wed, 9 Sep 2020 10:43:59 +0100 [thread overview]
Message-ID: <dc9b58c4-96f1-2270-406b-781f8d0a4f22@gmail.com> (raw)
In-Reply-To: <CAHr-Uu8umDQJ=LORaBNJX+wnmaeM1hHxxpG7xROPgCqgEPrwdw@mail.gmail.com>
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.
I tend to agree with Junio that we shouldn't be running the
post-checkout hook when rebasing.
Best Wishes
Phillip
>
> Tom
>
> On Wed, Aug 26, 2020 at 5:22 PM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>> ... If "git rebase" or whatever
>>> command wanted to place files and the index into some state by using
>>> "git checkout" command, and if the post-checkout hook mucked with
>>> the state in such a way that contradicts with what the "git rebase"
>>> command wanted them to be in, it is not surprising the hook's behavior
>>> broke "git rebase"'s operation.
>>
>> Having said all that, I actually think that "rebase" shouldn't be
>> invoking "git checkout" (and its equivalent) internally when
>> switching to a specific version, in such a way that it would trigger
>> any end-user specified hooks and allow them to muck with the working
>> tree and the index state.
>>
>> I haven't checked the actual implementation of "git rebase" for
>> quite some time to be sure, but we have lower-level plumbing
>> commands that are not affected by the end-user hooks for exactly
>> that kind of "build higher-level commands by synthesis of
>> lower-level machinery", and it is very possible that what we are
>> looking at is actually a bug that needs to be fixed. I dunno.
>>
>> Thanks.
next prev parent reply other threads:[~2020-09-09 9:44 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 [this message]
2020-09-09 16:07 ` Tom Rutherford
2020-09-11 20:25 ` Philippe Blain
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:
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=dc9b58c4-96f1-2270-406b-781f8d0a4f22@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tmrutherford@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).