From: Stefan Haller <lists@haller-berlin.de>
Date: Mon, 20 Mar 2023 07:29:07 GMT
Subject: Re: When exactly should REBASE_HEAD exist?
Message-ID: <1e943dab-23c7-9eed-df4c-c89084d2387b@haller-berlin.de>
In-Reply-To: <0eb3ed02-139a-b114-939a-d2ad286af743@dunelm.org.uk>

On 19.03.23 15:50, Phillip Wood wrote:
> Hmm, I think it is a bit complicated to do this reliably as if "pick B"
> has conflicts and git-rebase-todo contains
> 
>     exec make test
> 
> and done contains
> 
>     pick A
>     exec make test
>     pick B
> 
> it looks like "exec make test" has been rescheduled when in fact "pick
> B" failed with conflicts. If you look at the last three lines of "done"
> you can distinguish the two cases but it is a bit of a faff.

Ah, thanks for coming up with this tricky case. I'm leaning towards
simply ignoring it, since (at least for my usage of git) it's very
uncommon; if I use "-x make test" to check all commits, I almost always
do that in place, so I won't get conflicts.

But it's one more argument for adding the information to git status, I
suppose.

-Stefan