Merge branch 'jc/test-must-be-empty'

gitster · gitster · commit 5ff42d42da9c · 2018-04-11T13:09:54.000+09:00
Test helper update.

* jc/test-must-be-empty:
  test_must_be_empty: simplify file existence check
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
@@ -782,11 +782,8 @@ verbose () {
 # otherwise.
 
 test_must_be_empty () {
-	if ! test -f "$1"
-	then
-		echo "'$1' is missing"
-		return 1
-	elif test -s "$1"
+	test_path_is_file "$1" &&
+	if test -s "$1"
 	then
 		echo "'$1' is not empty, it contains:"
 		cat "$1"
