mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/grep-author-all-match-implicit' into maint

Browse Source 
* jc/grep-author-all-match-implicit:
  "log --author=me --grep=it" should find intersection, not union
This commit is contained in:
Junio C Hamano
2010-03-08 00:35:59 -08:00
parent 89cd4aa862 80235ba79e
commit 1f54d693fd
6 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
t/t7002-grep.sh
View File

@ -353,7 +353,7 @@ test_expect_success 'log grep (4)' '
'
test_expect_success 'log grep (5)' '
git log --author=Thor -F --grep=Thu --pretty=tformat:%s >actual &&
git log --author=Thor -F --pretty=tformat:%s >actual &&
( echo third ; echo initial ) >expect &&
test_cmp expect actual
'
@ -364,6 +364,14 @@ test_expect_success 'log grep (6)' '
test_cmp expect actual
'
test_expect_success 'log --grep --author implicitly uses all-match' '
# grep matches initial and second but not third
# author matches only initial and third
git log --author="A U Thor" --grep=s --grep=l --format=%s >actual &&
echo initial >expect &&
test_cmp expect actual
'
test_expect_success 'grep with CE_VALID file' '
git update-index --assume-unchanged t/t &&
rm t/t &&