From: kristofferhaugsbakk@fastmail.com
To: git@vger.kernel.org
Cc: Kristoffer Haugsbakk <code@khaugsbakk.name>,
christian.couder@gmail.com, newren@gmail.com,
Siddharth Asthana <siddharthasthana31@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH v3 4/6] replay: improve code comment and die message
Date: Mon, 5 Jan 2026 20:53:20 +0100 [thread overview]
Message-ID: <V3_comment~fserror_suggestions.1a8@msgid.xyz> (raw)
In-Reply-To: <V3_CV_replay_die_descr.1a4@msgid.xyz>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
Suggested-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Notes (series):
v3: [new]
https://lore.kernel.org/git/CABPp-BH1b3rHi96qXLQwQRX6g7POmqYLKyAc=_1UsWmfiWsGFg@mail.gmail.com/
builtin/replay.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/replay.c b/builtin/replay.c
index dfb98eb3a9c..3dde20acfef 100644
--- a/builtin/replay.c
+++ b/builtin/replay.c
@@ -351,11 +351,11 @@ int cmd_replay(int argc,
set_up_replay_mode(repo, &revs.cmdline,
onto_name, &advance_name,
&onto, &update_refs);
- /* FIXME: Should handle replaying down to root commit */
+ /* FIXME: Should allow replaying commits with the first as a root commit */
if (prepare_revision_walk(&revs) < 0) {
ret = error(_("error preparing revisions"));
goto cleanup;
}
@@ -369,11 +369,11 @@ int cmd_replay(int argc,
const struct name_decoration *decoration;
khint_t pos;
int hr;
if (!commit->parents)
- die(_("replaying down to root commit is not supported yet!"));
+ die(_("replaying down from root commit is not supported yet!"));
if (commit->parents->next)
die(_("replaying merge commits is not supported yet!"));
last_commit = pick_regular_commit(repo, commit, replayed_commits,
onto, &merge_opt, &result);
--
2.52.0.383.gb1c58d6b301
next prev parent reply other threads:[~2026-01-05 19:55 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
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 ` kristofferhaugsbakk [this message]
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='V3_comment~fserror_suggestions.1a8@msgid.xyz' \
--to=kristofferhaugsbakk@fastmail.com \
--cc=christian.couder@gmail.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=siddharthasthana31@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.
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 NNTP newsgroup(s).