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 <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>next
parent
6c3d7b7355
commit
88101d339a
|
|
@ -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)"
|
||||
'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue