[PATCH v3 4/6] replay: improve code comment and die message
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