]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/grep-patterntype'
authorJunio C Hamano <gitster@pobox.com>
Fri, 25 Feb 2022 23:47:35 +0000 (15:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 25 Feb 2022 23:47:36 +0000 (15:47 -0800)
Some code clean-up in the "git grep" machinery.

* ab/grep-patterntype:
  grep: simplify config parsing and option parsing
  grep.c: do "if (bool && memchr())" not "if (memchr() && bool)"
  grep.h: make "grep_opt.pattern_type_option" use its enum
  grep API: call grep_config() after grep_init()
  grep.c: don't pass along NULL callback value
  built-ins: trust the "prefix" from run_builtin()
  grep tests: add missing "grep.patternType" config tests
  grep tests: create a helper function for "BRE" or "ERE"
  log tests: check if grep_config() is called by "log"-like cmds
  grep.h: remove unused "regex_t regexp" from grep_opt

1  2 
builtin/grep.c
builtin/log.c
git.c
grep.c
revision.c
t/t4202-log.sh

diff --cc builtin/grep.c
Simple merge
diff --cc builtin/log.c
Simple merge
diff --cc git.c
Simple merge
diff --cc grep.c
Simple merge
diff --cc revision.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge