From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2018 21:33:49 +0000 (-0700)
Subject: Merge branch 'ab/test-must-be-empty-for-master'
X-Git-Tag: v2.19.0-rc1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/99fb11d15b983abdda39b5bd5d16736c1550fe43?hp=56ce87daffe58135abcaf235f2dec008f5f4cb4d

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

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
index 02936c2f24..0bf10d0686 100755
--- 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
 '