diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 20:44:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 20:44:06 (GMT) |
| commit | 6b45b8c088f21566cd9cb7839f8421bf616382a2 (patch) | |
| tree | cfafac45e083d85e011aef8e6a77b12b6d1b103e /t | |
| parent | 82cd8358e8203fa02da18e8ee71449cb45c4157d (diff) | |
| parent | 80235ba79ef43349f455cce869397b3e726f4058 (diff) | |
| download | git-6b45b8c088f21566cd9cb7839f8421bf616382a2.zip git-6b45b8c088f21566cd9cb7839f8421bf616382a2.tar.gz git-6b45b8c088f21566cd9cb7839f8421bf616382a2.tar.bz2 | |
Merge branch 'jc/grep-author-all-match-implicit'
* jc/grep-author-all-match-implicit:
"log --author=me --grep=it" should find intersection, not union
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7002-grep.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh index ebae152..e249c3e 100755 --- a/t/t7002-grep.sh +++ b/t/t7002-grep.sh @@ -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 && |