aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-08-25 02:15:05 -0400
committerJunio C Hamano <gitster@pobox.com>2008-08-24 23:28:02 -0700
commit0843acfd2c32dd8a8594731a0090d0934ccb123b (patch)
tree6982da4ae0ce4fd74a109e7db7e83c368bfd90e4 /t
parent5760a6b094736e6f59eb32c7abb4cdbb7fca1627 (diff)
downloadgit-0843acfd2c32dd8a8594731a0090d0934ccb123b.tar.gz
git-0843acfd2c32dd8a8594731a0090d0934ccb123b.tar.xz
Fix "git log -i --grep"
This has been broken in v1.6.0 due to the reorganization of the revision option parsing code. The "-i" is completely ignored, but works fine in "git log --grep -i". What happens is that the code for "-i" looks for revs->grep_filter; if it is NULL, we do nothing, since there are no grep filters. But that is obviously not correct, since we want it to influence the later --grep option. Doing it the other way around works, since "-i" just impacts the existing grep_filter option. Instead, we now always initialize the grep_filter member and just fill in options and patterns as we get them. This means that we can no longer check grep_filter for NULL, but instead must check the pattern list to see if we have any actual patterns. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4202-log.sh22
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 4c8af45f8..0ab925c4e 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -69,7 +69,29 @@ test_expect_success 'diff-filter=D' '
'
+test_expect_success 'setup case sensitivity tests' '
+ echo case >one &&
+ test_tick &&
+ git commit -a -m Second
+'
+
+test_expect_success 'log --grep' '
+ echo second >expect &&
+ git log -1 --pretty="tformat:%s" --grep=sec >actual &&
+ test_cmp expect actual
+'
+test_expect_success 'log -i --grep' '
+ echo Second >expect &&
+ git log -1 --pretty="tformat:%s" -i --grep=sec >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'log --grep -i' '
+ echo Second >expect &&
+ git log -1 --pretty="tformat:%s" --grep=sec -i >actual &&
+ test_cmp expect actual
+'
test_done