summaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2018-08-19 21:57:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-21 18:48:34 (GMT)
commitec21ac8c189537df815e49bdf8f08da927665cf2 (patch)
tree36c09e7ca122410c6418b5b58ded1e330460280b /t/t3308-notes-merge.sh
parentf0dc593a95877298ba6fa9d29e5c779832ad5894 (diff)
downloadgit-ec21ac8c189537df815e49bdf8f08da927665cf2.zip
git-ec21ac8c189537df815e49bdf8f08da927665cf2.tar.gz
git-ec21ac8c189537df815e49bdf8f08da927665cf2.tar.bz2
tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'
Using 'test_must_be_empty' is more idiomatic than 'test_cmp /dev/null out', and its message on error is perhaps a bit more to the point. This patch was basically created by running: sed -i -e 's%test_cmp /dev/null%test_must_be_empty%' t[0-9]*.sh with the exception of the change in 'should not fail in an empty repo' in 't7401-submodule-summary.sh', where it was 'test_cmp output /dev/null'. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3308-notes-merge.sh')
-rwxr-xr-xt/t3308-notes-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh
index ab946a5..d60588e 100755
--- 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 &&