[PATCH] replay: support replaying down from root commit
- From
Toon Claes <toon@iotcl.com>
- Date
- Mar 17, 2026, 18:56 UTC
- Message-ID
- <20260317-toon-replay-down-to-root-v1-1-cb5c249e15fd@iotcl.com>
git-replay(1) doesn't allow replaying commits all the way down to the root commit. Fix that.
Signed-off-by: Toon Claes <toon@iotcl.com> --- These changes might conflict Siddharth's series[1] to add '--revert' to git-replay(1), although resolving that should be trivial.
[1]: https://lore.kernel.org/git/20260313054035.26605-1-siddharthasthana31@gmail.com/ --- replay.c | 18 ++++++++++-------- t/t3650-replay-basics.sh | 10 +++++++--- 2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/replay.c b/replay.c index a63f6714c4..63ff56552e 100644 --- a/replay.c +++ b/replay.c @@ -225,12 +225,18 @@ static struct commit *pick_regular_commit(struct repository *repo, struct commit *base, *replayed_base; struct tree *pickme_tree, *base_tree, *replayed_base_tree; - base = pickme->parents->item; - replayed_base = mapped_commit(replayed_commits, base, onto); + if (pickme->parents) { + base = pickme->parents->item; + replayed_base = mapped_commit(replayed_commits, base, onto); + base_tree = repo_get_commit_tree(repo, base); + } else { + base = NULL; + replayed_base = onto; + base_tree = lookup_tree(repo, repo->hash_algo->empty_tree); + } replayed_base_tree = repo_get_commit_tree(repo, replayed_base); pickme_tree = repo_get_commit_tree(repo, pickme); - base_tree = repo_get_commit_tree(repo, base); merge_opt->branch1 = short_commit_name(repo, replayed_base); merge_opt->branch2 = short_commit_name(repo, pickme); @@ -293,8 +299,6 @@ int replay_revisions(struct rev_info *revs, set_up_replay_mode(revs->repo, &revs->cmdline, opts->onto, &detached_head, &advance, &onto, &update_refs); - /* FIXME: Should allow replaying commits with the first as a root commit */ - if (prepare_revision_walk(revs) < 0) { ret = error(_("error preparing revisions")); goto out; @@ -309,9 +313,7 @@ int replay_revisions(struct rev_info *revs, khint_t pos; int hr; - if (!commit->parents) - die(_("replaying down from root commit is not supported yet!")); - if (commit->parents->next) + if (commit->parents && commit->parents->next) die(_("replaying merge commits is not supported yet!")); last_commit = pick_regular_commit(revs->repo, commit, replayed_commits, diff --git a/t/t3650-replay-basics.sh b/t/t3650-replay-basics.sh index a03f8f9293..9c55b62757 100755 --- a/t/t3650-replay-basics.sh +++ b/t/t3650-replay-basics.sh @@ -81,9 +81,13 @@ test_expect_success 'option --onto or --advance is mandatory' ' test_cmp expect actual ' -test_expect_success 'no base or negative ref gives no-replaying down to root error' ' - echo "fatal: replaying down from root commit is not supported yet!" >expect && - test_must_fail git replay --onto=topic1 topic2 2>actual && +test_expect_success 'replay down to root onto another branch' ' + git replay --ref-action=print --onto main topic2 >result && + + test_line_count = 1 result && + + git log --format=%s $(cut -f 3 -d " " result) >actual && + test_write_lines E D C M L B A >expect && test_cmp expect actual ' --- base-commit: ca1db8a0f7dc0dbea892e99f5b37c5fe5861be71 change-id: 20260317-toon-replay-down-to-root-d412048f1741