From: "Kristoffer Haugsbakk" <code@khaugsbakk•name>
To: "Elijah Newren" <newren@gmail•com>,
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com>
Cc: git@vger•kernel.org,
"Christian Couder" <christian.couder@gmail•com>,
"Siddharth Asthana" <siddharthasthana31@gmail•com>,
"Phillip Wood" <phillip.wood@dunelm•org.uk>
Subject: Re: [PATCH v2 3/5] replay: die descriptively when invalid commit-ish is given
Date: Fri, 02 Jan 2026 12:11:29 +0100 [thread overview]
Message-ID: <c488a180-b840-43df-a593-4dac6b7f00d2@app.fastmail.com> (raw)
In-Reply-To: <CABPp-BH1b3rHi96qXLQwQRX6g7POmqYLKyAc=_1UsWmfiWsGFg@mail.gmail.com>
On Tue, Dec 30, 2025, at 23:52, Elijah Newren wrote:
>>[snip]
>> @@ -349,13 +351,10 @@ int cmd_replay(int argc,
>>
>> populate_for_onto_or_advance_mode(repo, &revs.cmdline,
>> onto_name, &advance_name,
>> &onto, &update_refs);
>>
>> - if (!onto) /* FIXME: Should handle replaying down to root commit */
>> - die("Replaying down to root commit is not supported yet!");
>> -
>
> Removing the `if` makes sense given the current code, but I wonder if
> we should keep a corrected FIXME here:
> /* FIXME: Should allow replaying commits with the first as a root commit */
Okay, I will change to keeping this updated comment at this line but
remove the if-block. And I will remove the moved comment:
if (!commit->parents) /* FIXME: Should handle replaying down to root commit */
die(_("replaying down to root commit is not supported yet!"));
Specifically I will remove the if-block on this patch/commit and make
another patch for both renaming the comment and the “replaying down”
die-statement.
>
> This is out-of-scope for this series, but behind that FIXME...
>
> I'm guessing the user would specify to cherry-pick onto NULL via something like
> git replay --root A..B
> which would translate into making `onto` be NULL, and mean that the
> first commit after A would be a root commit.
>
> Similarly the user could be allowed to do something like
> git replay --advance new-empty-branch A..B
> where new-empty-branch doesn't yet point to a commit, this would also
> result in `onto` being NULL, and start new-empty-branch by
> cherry-picking some commits into it.
Okay. With options from git-rev-list(1) like `--root` this mode makes sense.
>
>> if (prepare_revision_walk(&revs) < 0) {
>> ret = error(_("error preparing revisions"));
>> goto cleanup;
>> }
>>
>>
>> @@ -367,11 +366,11 @@ int cmd_replay(int argc,
>> while ((commit = get_revision(&revs))) {
>> const struct name_decoration *decoration;
>> khint_t pos;
>> int hr;
>>
>> - if (!commit->parents)
>> + if (!commit->parents) /* FIXME: Should handle replaying down to root commit */
>> die(_("replaying down to root commit is not supported yet!"));
>
> I wonder if I should have written s/to/from/ here ?
“replaying down from”? Not “replaying from”?
>
>
>>[snip]
next prev parent reply other threads:[~2026-01-02 11:11 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-22 22:04 [PATCH 0/2] replay: die descriptively when invalid commit-ish kristofferhaugsbakk
2025-12-22 22:04 ` [PATCH 1/2] " kristofferhaugsbakk
2025-12-23 3:12 ` Junio C Hamano
2025-12-23 10:52 ` Phillip Wood
2025-12-23 13:41 ` Junio C Hamano
2025-12-30 14:30 ` Kristoffer Haugsbakk
2025-12-22 22:04 ` [PATCH 2/2] t3650: add more regression tests for failure conditions kristofferhaugsbakk
2025-12-23 10:58 ` Phillip Wood
2025-12-30 14:33 ` Kristoffer Haugsbakk
2025-12-23 3:16 ` [PATCH 0/2] replay: die descriptively when invalid commit-ish Junio C Hamano
2025-12-30 14:33 ` Kristoffer Haugsbakk
2025-12-24 3:03 ` Elijah Newren
2025-12-30 14:31 ` Kristoffer Haugsbakk
2025-12-30 15:01 ` [PATCH v2 0/5] " kristofferhaugsbakk
2025-12-30 15:01 ` [PATCH v2 1/5] replay: remove dead code and rearrange kristofferhaugsbakk
2025-12-30 22:50 ` Elijah Newren
2025-12-30 23:37 ` Junio C Hamano
2026-01-02 9:51 ` Kristoffer Haugsbakk
2025-12-30 15:01 ` [PATCH v2 2/5] replay: find *onto only after testing for ref name kristofferhaugsbakk
2025-12-30 22:51 ` Elijah Newren
2025-12-30 15:01 ` [PATCH v2 3/5] replay: die descriptively when invalid commit-ish is given kristofferhaugsbakk
2025-12-30 22:52 ` Elijah Newren
2026-01-02 11:11 ` Kristoffer Haugsbakk [this message]
2025-12-30 15:01 ` [PATCH v2 4/5] replay: die if we cannot parse object kristofferhaugsbakk
2025-12-30 15:01 ` [PATCH v2 5/5] t3650: add more regression tests for failure conditions kristofferhaugsbakk
2025-12-30 22:53 ` [PATCH v2 0/5] replay: die descriptively when invalid commit-ish Elijah Newren
2026-01-05 19:53 ` [PATCH v3 0/6] " kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 1/6] replay: remove dead code and rearrange kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 2/6] replay: find *onto only after testing for ref name kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 3/6] replay: die descriptively when invalid commit-ish is given kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 4/6] replay: improve code comment and die message kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 5/6] replay: die if we cannot parse object kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 6/6] t3650: add more regression tests for failure conditions kristofferhaugsbakk
2026-01-06 23:12 ` [PATCH v3 0/6] replay: die descriptively when invalid commit-ish Elijah Newren
2026-01-07 3:56 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c488a180-b840-43df-a593-4dac6b7f00d2@app.fastmail.com \
--to=code@khaugsbakk$(echo .)name \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=siddharthasthana31@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox