From: Toon Claes Date: Tue, 31 Mar 2026 07:55:20 GMT Subject: Re: [PATCH v2 0/3] Add option --ref to git-replay(1) Message-ID: <87tstwl9g7.fsf@toon--20250203-5JQV3.mail-host-address-is-not-set> In-Reply-To: Junio C Hamano writes: > As sa/replay-revert has been updated, I rebased these three patches > on top of the updated version of that other topic and merged it to > 'seen', which broke CI with t3650. > > I naturally suspected that I made some stupid mistakes while > rebasing, so I applied these three patches directly on top of that > old sa/replay-revert. Unfortunately, the same test t3650 fails > exactly the same way with merge-ort aborting. > > The failing test run fails like so: > > ok 45 - --ref with nonexistent fully-qualified ref > > expecting success of 3650.46 '--ref must be a valid refname': > test_must_fail git replay --onto=main --ref="refs/heads/bad..ref" topic1..topic2 2>err && > test_grep "is not a valid refname" err > > /home/gitster/w/git.git/t/test-lib-functions.sh: line 1180: 2840466 Aborted (core dumped) "$@" 2>&7 > test_must_fail: died by signal 6: git replay --onto=main --ref=refs/heads/bad..ref topic1..topic2 > not ok 46 - --ref must be a valid refname > # > # test_must_fail git replay --onto=main --ref="refs/heads/bad..ref" topic1..topic2 2>err && > # test_grep "is not a valid refname" err > # No need for you to worry about those conflicts. I'm happy to do the rebase myself. -- Cheers, Toon