Merge branch 'maint-1.6.0' into maint-1.6.1

[git.git] / t / t7002-grep.sh

diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index 087bacb89747bb3da7fc3f7ab3fe08bacea91d52..b81593780a2a6adaf34bb10293b607e3a303cfcd 100755 (executable)
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -113,7 +113,7 @@ do
        '
 
        test_expect_success "grep -c $L (no /dev/null)" '
-               ! git grep -c test $H | grep -q /dev/null
+               ! git grep -c test $H | grep /dev/null
         '
 
 done
@@ -165,7 +165,14 @@ test_expect_success 'log grep (6)' '
        git log --author=-0700  --pretty=tformat:%s >actual &&
        >expect &&
        test_cmp expect actual
+'
 
+test_expect_success 'grep with CE_VALID file' '
+       git update-index --assume-unchanged t/t &&
+       rm t/t &&
+       test "$(git grep --no-ext-grep t)" = "t/t:test" &&
+       git update-index --no-assume-unchanged t/t &&
+       git checkout t/t
 '
 
 test_done