diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:17 -0700 |
| commit | e8c7b8cf683bcaecfca21a9dd7c9464c50b4d1dd (patch) | |
| tree | 2fa05d8fa206fb3a463cfcb80f37063fa6350748 | |
| parent | 6de6aba9f20d25b0628fb276ce5b60492c23b1ce (diff) | |
| parent | 2bb051861731a0d8d2a79d0b36857d877f18e476 (diff) | |
| download | git-e8c7b8cf683bcaecfca21a9dd7c9464c50b4d1dd.tar.gz | |
Merge branch 'ak/t4151-ls-files-could-be-empty' into maint
Test fix.
* ak/t4151-ls-files-could-be-empty:
t4151: make sure argument to 'test -z' is given
| -rwxr-xr-x | t/t4151-am-abort.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index ea5ace99a1..9473c2779e 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -82,7 +82,7 @@ test_expect_success 'am -3 --abort removes otherfile-4' ' test 4 = "$(cat otherfile-4)" && git am --abort && test_cmp_rev initial HEAD && - test -z $(git ls-files -u) && + test -z "$(git ls-files -u)" && test_path_is_missing otherfile-4 ' |