From: Phillip Wood Date: Tue, 30 Jun 2026 15:28:51 +0000 (+0100) Subject: t3400: restore coverage for note copying with apply backend X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fade29b56515d1529823e1cf99f1de19d930ff5d;p=thirdparty%2Fgit.git t3400: restore coverage for note copying with apply backend Now that the merge backend is the default we have lost coverage for "git rebase --apply" copying notes. Fix this by replacing "-m" with "--apply" as the previous test which uses the default backend now checks the merge backend. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index c0c00fbb7b..f0e7fcf649 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -270,9 +270,9 @@ test_expect_success 'rebase can copy notes' ' test "a note" = "$(git notes show HEAD)" ' -test_expect_success 'rebase -m can copy notes' ' +test_expect_success 'rebase --apply can copy notes' ' git reset --hard n3 && - git rebase -m --onto n1 n2 && + git rebase --apply --onto n1 n2 && test "a note" = "$(git notes show HEAD)" '