Merge branch 'ma/t1400-undebug-test' into maint

gitster · gitster · commit 6f1c8154aa35 · 2018-11-21T22:58:01.000+09:00
Test fix.

* ma/t1400-undebug-test:
  t1400: drop debug `echo` to actually execute `test`
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
@@ -366,7 +366,7 @@ test_expect_success 'Query master@{2005-05-25} (before history)' '
 	test_when_finished "rm -f o e" &&
 	git rev-parse --verify master@{2005-05-25} >o 2>e &&
 	test $C = $(cat o) &&
-	echo test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
+	test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
 '
 test_expect_success 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' '
 	test_when_finished "rm -f o e" &&

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ test_expect_success 'Query master@{2005-05-25} (before history)' '`
`366`	`366`	`test_when_finished "rm -f o e" &&`
`367`	`367`	`git rev-parse --verify master@{2005-05-25} >o 2>e &&`
`368`	`368`	`test $C = $(cat o) &&`
`369`		`- echo test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"`
	`369`	`+ test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"`
`370`	`370`	`'`
`371`	`371`	`test_expect_success 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' '`
`372`	`372`	`test_when_finished "rm -f o e" &&`