Merge branch 'ak/t4151-ls-files-could-be-empty' into maint

gitster · gitster · commit e8c7b8cf683b · 2016-05-26T13:17:17.000-07:00
Test fix.

* ak/t4151-ls-files-could-be-empty:
  t4151: make sure argument to 'test -z' is given
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ test_expect_success 'am -3 --abort removes otherfile-4' '`
`82`	`82`	`test 4 = "$(cat otherfile-4)" &&`
`83`	`83`	`git am --abort &&`
`84`	`84`	`test_cmp_rev initial HEAD &&`
`85`		`- test -z $(git ls-files -u) &&`
	`85`	`+ test -z "$(git ls-files -u)" &&`
`86`	`86`	`test_path_is_missing otherfile-4`
`87`	`87`	`'`
`88`	`88`