undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-grep: Bail out when -P is used with -F or -E

Browse Source 
This patch makes git-grep die() when -P is used on command line together
with -E/--extended-regexp or -F/--fixed-strings.

This also makes it bail out when grep.extendedRegexp is enabled.

But `git grep -G -P pattern` and `git grep -E -G -P pattern` still work
because -G and -E set opts.regflags during parse_options() and there is
no way to detect `-G` or `-E -G`.

Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michał Kiedrowicz 2011-05-09 23:52:08 +02:00 committed by Junio C Hamano
parent 8f852ce613
commit 258a618849
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/grep.c
View File

@ -925,9 +925,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
if (!opt.pattern_list) if (!opt.pattern_list)
die(_("no pattern given.")); die(_("no pattern given."));
if (opt.regflags != REG_NEWLINE && opt.pcre)
die(_("cannot mix --extended-regexp and --perl-regexp"));
if (!opt.fixed && opt.ignore_case) if (!opt.fixed && opt.ignore_case)
opt.regflags |= REG_ICASE; opt.regflags |= REG_ICASE;
if ((opt.regflags != REG_NEWLINE) && opt.fixed) if ((opt.regflags != REG_NEWLINE || opt.pcre) && opt.fixed)
die(_("cannot mix --fixed-strings and regexp")); die(_("cannot mix --fixed-strings and regexp"));
#ifndef NO_PTHREADS #ifndef NO_PTHREADS

16
t/t7810-grep.sh
View File

@ -637,4 +637,20 @@ test_expect_success LIBPCRE 'grep -P -w pattern' '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success LIBPCRE 'grep -P -F returns error' '
test_expect_code 128 git grep -P -F main
'
test_expect_success LIBPCRE 'grep -P -E returns error' '
test_expect_code 128 git grep -P -E main
'
test_expect_failure LIBPCRE 'grep -P -G returns error' '
test_expect_code 128 git grep -P -G main
'
test_expect_failure LIBPCRE 'grep -P -E -G returns error' '
test_expect_code 128 git grep -P -E -G main
'
test_done test_done