Merge branch 'tz/complete-branch-copy' into maint

diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh
index 19aed7ec953b3d384a2f44ee2bae7fd4c92fc5fa..ab946a5153c041de92bde52aed4d47c2a0d80b21 100755 (executable)
--- a/t/t3308-notes-merge.sh
+++ b/t/t3308-notes-merge.sh
@@ -79,7 +79,7 @@ test_expect_success 'fail to merge empty notes ref into empty notes ref (z => y)
 test_expect_success 'fail to merge into various non-notes refs' '
        test_must_fail git -c "core.notesRef=refs/notes" notes merge x &&
        test_must_fail git -c "core.notesRef=refs/notes/" notes merge x &&
-       mkdir -p .git/refs/notes/dir &&
+       git update-ref refs/notes/dir/foo HEAD &&
        test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x &&
        test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x &&
        test_must_fail git -c "core.notesRef=refs/heads/master" notes merge x &&