diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-03 14:50:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-09 23:21:29 -0700 |
| commit | 34a4ae55b260bbd1520d6a7c6718b4de2d5c7632 (patch) | |
| tree | 7c1c93cc63969f00dacb03d11edc4a61de5c8165 | |
| parent | 918d4e1c907983d26b0c4d82d7f7abff4dbec4e5 (diff) | |
| download | git-34a4ae55b260bbd1520d6a7c6718b4de2d5c7632.tar.gz git-34a4ae55b260bbd1520d6a7c6718b4de2d5c7632.tar.xz | |
log --grep: use the same helper to set -E/-F options as "git grep"
The command line option parser for "git log -F -E --grep='<ere>'"
did not flip the "fixed" bit, violating the general "last option
wins" principle among conflicting options.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 4 | ||||
| -rwxr-xr-x | t/t4202-log.sh | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/revision.c b/revision.c index a4a931426..68545c801 100644 --- a/revision.c +++ b/revision.c @@ -1604,12 +1604,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--grep-debug")) { revs->grep_filter.debug = 1; } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) { - revs->grep_filter.regflags |= REG_EXTENDED; + grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE, &revs->grep_filter); } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) { revs->grep_filter.regflags |= REG_ICASE; DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE); } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) { - revs->grep_filter.fixed = 1; + grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED, &revs->grep_filter); } else if (!strcmp(arg, "--all-match")) { revs->grep_filter.all_match = 1; } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) { diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 924ba536c..e6537abe1 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -230,6 +230,12 @@ test_expect_success 'log --grep -i' ' test_cmp expect actual ' +test_expect_success 'log -F -E --grep=<ere> uses ere' ' + echo second >expect && + git log -1 --pretty="tformat:%s" -F -E --grep=s.c.nd >actual && + test_cmp expect actual +' + cat > expect <<EOF * Second * sixth |