diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-04-06 15:42:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-06 15:42:49 -0700 |
| commit | da54784d1cc3f4fdd90622fb9e3ae34a9e771702 (patch) | |
| tree | ed0b38fd736278b336fc8d6b6ade60d03b3db5cd /t | |
| parent | 03311dca7f91f69e9e0c532fce1c1e3c0a9fa34d (diff) | |
| parent | e8b79a96ebaa2113391d14bfcdabe239f6ff8611 (diff) | |
| download | git-da54784d1cc3f4fdd90622fb9e3ae34a9e771702.tar.xz | |
Merge branch 'tc/replay-down-to-root'
git replay now supports replaying down to the root commit.
* tc/replay-down-to-root:
replay: support replaying down from root commit
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3650-replay-basics.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/t/t3650-replay-basics.sh b/t/t3650-replay-basics.sh index 217f6fb292..89819ad4d2 100755 --- a/t/t3650-replay-basics.sh +++ b/t/t3650-replay-basics.sh @@ -81,9 +81,13 @@ test_expect_success 'exactly one of --onto, --advance, or --revert is required' 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 ' |