Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index ac62dc0e8fdc4602fb006919f0c0b62a015964bd..84bbf88cf9d0cf8e2887abc6ef3a4c597ba4aa3a 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -481,10 +481,8 @@ test_expect_success 'list specific note with "git notes list <object>"' '
 '
 
 test_expect_success 'listing non-existing notes fails' '
-       cat >expect <<-EOF &&
-       EOF
        test_must_fail git notes list HEAD >actual &&
-       test_cmp expect actual
+       test_must_be_empty actual
 '
 
 test_expect_success 'append to existing note with "git notes append"' '