diff options
| author |  SZEDER Gábor <szeder.dev@gmail.com> | 2018-03-26 15:11:24 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-03-27 17:08:26 -0700 |
| commit | 9eb2308019b92625c659f759a6a27b5edeb1d815 (patch) | |
| tree | 2b9767a203d6c447e3cd2999bb1e51c5d38abbfa /t | |
| parent | test_must_be_empty: make sure the file exists, not just empty (diff) | |
| download | tgif-9eb2308019b92625c659f759a6a27b5edeb1d815.tar.xz | |
test_must_be_empty: simplify file existence check
Commit 11395a3b4b (test_must_be_empty: make sure the file exists, not
just empty, 2018-02-27) basically duplicated the 'test_path_is_file'
helper function in 'test_must_be_empty'.
Just call 'test_path_is_file' to avoid this code duplication.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -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 d2eaf5ab67..36ad8accdd 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -718,11 +718,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" |