On Fri, Mar 12 2021, Junio C Hamano wrote: > +# NEEDSWORK: Fix c762aada1ab3a2c428c with s/@/HEAD/; > + > test_expect_success 'rebase -x with empty command fails' ' > test_when_finished "git rebase --abort ||:" && > test_must_fail env git rebase -x "" @ 2>actual && > @@ -867,6 +869,22 @@ test_expect_success 'rebase -i can copy notes over a fixup' ' > test_cmp expect output > ' I eyeballed c762aada1ab (rebase -x: sanity check command, 2019-01-29) for a bit and still don't quite know what this HEAD v.s. @ is about in that context, seems this is a stray FIXME comment for an unrelated test. Maybe it would be better to have test_expect_failure etc. here as appropriate? > +test_expect_success 'notes are copied even rebase -x changes HEAD' ' > + git reset --hard n3 && > + git rebase -x "git commit --amend --no-edit" n1^1 && > + git log --format="%s <%N>" n1^1..n3 >expect && > + git log --format="%s <%N>" n1^1..HEAD >actual && > + test_cmp expect actual > +' > + > +test_expect_failure 'notes are copied even rebase -x changes HEAD' ' > + git reset --hard n3 && > + git rebase -x "git commit --amend -m tweak" n1^1 && > + git log --format="tweak <%N>" n1^1..n3 >expect && > + git log --format="%s <%N>" n1^1..HEAD >actual && > + test_cmp expect actual > +' > + > test_expect_success 'rebase while detaching HEAD' ' > git symbolic-ref HEAD && > grandparent=$(git rev-parse HEAD~2) &&
