From: Stefan Haller <lists@haller-berlin.de>
To: phillip.wood@dunelm.org.uk, git@vger.kernel.org
Subject: Re: When exactly should REBASE_HEAD exist?
Date: Mon, 20 Mar 2023 08:29:07 +0100 [thread overview]
Message-ID: <1e943dab-23c7-9eed-df4c-c89084d2387b@haller-berlin.de> (raw)
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
next prev parent reply other threads:[~2023-03-20 7:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 12:55 When exactly should REBASE_HEAD exist? Stefan Haller
2023-03-02 10:19 ` Phillip Wood
2023-03-02 20:27 ` Stefan Haller
2023-03-03 10:57 ` Stefan Haller
2023-03-03 21:25 ` Chris Torek
2023-03-04 8:36 ` Stefan Haller
2023-03-06 3:31 ` Chris Torek
2023-03-07 13:16 ` Stefan Haller
2023-03-05 14:33 ` Phillip Wood
2023-03-05 16:58 ` Stefan Haller
2023-03-05 14:31 ` Phillip Wood
2023-03-05 16:59 ` Stefan Haller
2023-03-05 19:13 ` Stefan Haller
2023-03-05 20:15 ` Phillip Wood
2023-03-08 19:02 ` Stefan Haller
2023-03-10 9:56 ` Phillip Wood
2023-03-10 17:42 ` Stefan Haller
2023-03-16 17:46 ` Phillip Wood
2023-03-19 14:50 ` Phillip Wood
2023-03-20 7:29 ` Stefan Haller [this message]
2023-03-20 8:42 ` Stefan Haller
2023-03-07 18:07 ` Junio C Hamano
2023-03-08 19:02 ` Stefan Haller
2023-03-08 19:40 ` Junio C Hamano
2023-03-09 14:45 ` Stefan Haller
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=1e943dab-23c7-9eed-df4c-c89084d2387b@haller-berlin.de \
--to=lists@haller-berlin.de \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
/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).