test_must_be_empty: make sure the file exists, not just empty

The helper function test_must_be_empty is meant to make sure the given file is empty, but its implementation is: if test -s "$1" then ... not empty, we detected a failure ... fi Surely, the file having non-zero size is a sign that the condition "the file must be empty" is violated, but it misses the case where the file does not even exist. It is an accident waiting to happen with a buggy test like this: git frotz 2>error-message && test_must_be_empty errro-message that won't get caught until you deliberately break 'git frotz' and notice why the test does not fail. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Feb 27, 2018 at 13:27 UTC 11395a3b4b16d9fc637ca2e41a6892ea2e6289ce
1 file changed +5 -1
t/test-lib-functions.sh
+5 -1
@@ -718,7 +718,11 @@ verbose () {
718 # otherwise.
719
720 test_must_be_empty () {
721 - if test -s "$1"
721 + if ! test -f "$1"
722 + then
723 + echo "'$1' is missing"
724 + return 1
725 + elif test -s "$1"
726 then
727 echo "'$1' is not empty, it contains:"
728 cat "$1"