From 2bb051861731a0d8d2a79d0b36857d877f18e476 Mon Sep 17 00:00:00 2001 From: Armin Kunaschik Date: Mon, 9 May 2016 11:57:25 -0700 Subject: t4151: make sure argument to 'test -z' is given 88d50724 (am --skip: revert changes introduced by failed 3way merge, 2015-06-06), unlike all the other patches in the series, forgot to quote the output from "$(git ls-files -u)" when using it as the argument to "test -z", leading to a syntax error on platforms whose test does not interpret "test -z" (no other arguments) as testing if a string "-z" is the null string (which GNU test and test that is built into bash and dash seem to do). Note that $(git ls-files -u | wc -l) is deliberately left unquoted, as some implementations of "wc -l" includes extra blank characters in its output and cannot be compared as string, i.e. "test 0 = $(...)". Signed-off-by: Armin Kunaschik Signed-off-by: Junio C Hamano --- t/t4151-am-abort.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index 833e7b2cea..b878c21d5d 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 ' -- cgit v1.2.1