Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Revert "t/lib-git-daemon: record daemon log"
[gitweb.git]
/
t
/
t3308-notes-merge.sh
diff --git
a/t/t3308-notes-merge.sh
b/t/t3308-notes-merge.sh
index ab946a5153c041de92bde52aed4d47c2a0d80b21..d60588ec8f0038e43d6327537240512afc832c4c 100755
(executable)
--- a/
t/t3308-notes-merge.sh
+++ b/
t/t3308-notes-merge.sh
@@
-183,7
+183,7
@@
test_expect_success 'merge empty notes ref (z => y)' '
git notes add -m "foo" &&
git notes remove &&
git notes >output_notes_z &&
- test_
cmp /dev/null
output_notes_z &&
+ test_
must_be_empty
output_notes_z &&
# Do the merge (z => y)
git config core.notesRef refs/notes/y &&
git notes merge z &&