diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:54 +0900 |
| commit | 5ff42d42da9c2c26737988d19b347c99489c8faa (patch) | |
| tree | 3067785e87b3602d464a1a2cf948fb273f91e813 | |
| parent | Merge branch 'cc/perf-aggregate-sort' (diff) | |
| parent | test_must_be_empty: simplify file existence check (diff) | |
| download | tgif-5ff42d42da9c2c26737988d19b347c99489c8faa.tar.xz | |
Merge branch 'jc/test-must-be-empty'
Test helper update.
* jc/test-must-be-empty:
test_must_be_empty: simplify file existence check
| -rw-r--r-- | t/test-lib-functions.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index b895366fee..7d620bf2a9 100644 --- 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" |