Merge branch 'ab/test-must-be-empty-for-master'

gitster · gitster · commit 99fb11d15b98 · 2018-08-27T14:33:49.000-07:00
Test fixes.

* ab/test-must-be-empty-for-master:
  t6018-rev-list-glob: fix 'empty stdin' test
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
@@ -256,7 +256,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '
 '
 
 test_expect_failure 'rev-list should succeed with empty output on empty stdin' '
-	git rev-list --stdin <expect >actual &&
+	git rev-list --stdin </dev/null >actual &&
 	test_must_be_empty actual
 '
 

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '`
`256`	`256`	`'`
`257`	`257`
`258`	`258`	`test_expect_failure 'rev-list should succeed with empty output on empty stdin' '`
`259`		`- git rev-list --stdin <expect >actual &&`
	`259`	`+ git rev-list --stdin </dev/null >actual &&`
`260`	`260`	`test_must_be_empty actual`
`261`	`261`	`'`
`262`	`262`