Something like this follows Documentation/SubmittingPatches, except that it further needs your Sign-off before mine, which I can forge if you say it is OK. Thanks for a report and an analysis of the issue. -- >8 -- From: Armin Kunaschik <megabreit@xxxxxxxxxxxxxx> 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. Note that $(git ls-files -u | wc -l) are 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: Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- 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 833e7b2..b878c21 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 ' -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html