Merge branch 'maint-1.5.4' into maint

diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index 6bfb899ed10606886ea3ce444f636b687bbfb66d..c8b4f65f380f3941c75bd6ed52975777d2b28d67 100755 (executable)
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -107,6 +107,10 @@ do
                diff expected actual
        '
 
+       test_expect_success "grep -c $L (no /dev/null)" '
+               ! git grep -c test $H | grep -q /dev/null
+        '
+
 done
 
 test_done