diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-28 23:42:41 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-28 23:42:41 -0800 |
commit | f9686cdc23f143abe111c15c22dd1c2b3c33fd67 (patch) | |
tree | a980a3c1cf645a98ae31a4c5cdea2ff76bcd7845 /t/t7002-grep.sh | |
parent | Merge branch 'jc/maint-ls-tree' into maint (diff) | |
parent | grep: grep cache entries if they are "assume unchanged" (diff) | |
download | tgif-f9686cdc23f143abe111c15c22dd1c2b3c33fd67.tar.xz |
Merge branch 'nd/grep-assume-unchanged' into maint
* nd/grep-assume-unchanged:
grep: grep cache entries if they are "assume unchanged"
grep: support --no-ext-grep to test builtin grep
Diffstat (limited to 't/t7002-grep.sh')
-rwxr-xr-x | t/t7002-grep.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh index 18fe6f2d57..c4938544d4 100755 --- a/t/t7002-grep.sh +++ b/t/t7002-grep.sh @@ -161,7 +161,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 |