From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Feb 2022 23:47:35 +0000 (-0800)
Subject: Merge branch 'ab/grep-patterntype'
X-Git-Tag: v2.36.0-rc0~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b84280c65bef19bc3a810e17474c9861ea7ce89;p=thirdparty%2Fgit.git

Merge branch 'ab/grep-patterntype'

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
---

5b84280c65bef19bc3a810e17474c9861ea7ce89