Merge branch 'avar/pcre2-conversion-of-diffcore-pickaxe-plus-avar/grep-post-drop-prefix-cleanup' into build-master

* avar/pcre2-conversion-of-diffcore-pickaxe-plus-avar/grep-post-drop-prefix-cleanup:
  HOTFIX for being on top of avar/grep-post-drop-prefix-cleanup
  fixup earlier, ./t7810-grep.sh (and maybe ./t4014-format-patch.sh?) fails without this
  better?
  free stuff, is the objfind a bug?
  Revert "wip reg_newline etc. test"
  only compile pattern once: TODO, free it
  wip reg_newline etc. test
  diffcore-pickaxe: add --pickaxe-patch for use with -G
  Remove unused kwset.[ch]
  pickaxe: use PCREv2 for -G and -S
  grep.h: make patmatch() a public function

Author: avar

Documentation/diff-options.txt

@@ -671,6 +671,9 @@ occurrences of that string did not change).
 Unless `--text` is supplied patches of binary files without a textconv
 filter will be ignored.
 +
+When `--pickaxe-patch` is supplied the whole diff is searched instead
+of just added/removed lines. See below.
++
 See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more
 information.
 
@@ -692,6 +695,20 @@ The object can be a blob or a submodule commit. It implies the `-t` option in
 	Treat the <string> given to `-S` as an extended POSIX regular
 	expression to match.
 
+--pickaxe-patch::
+	When `-G` looks for a change a diff will be generated, and
+	only the added/removed lines will be matched against with the
+	"+" or "-" stripped.
++
+Supplying this option skips that pre-processing. This makes it
+possible to match only lines that added or removed something matching
+a <regex> with "\^\+<regex>" and "^-<regex>", respectively.
++
+It also allows for finding something in the diff context. E.g. "\^
+<regex>" will match the context lines (see `-U<n>` above) around the
+added/removed lines, and doing an unanchored match will match any of
+the the added/removed lines & diff context.
+
 endif::git-format-patch[]
 
 -O<orderfile>::

Makefile

@@ -1036,7 +1036,6 @@ LIB_OBJS += commit-graph.o
 LIB_OBJS += commit-reach.o
 LIB_OBJS += commit.o
 LIB_OBJS += compat/nonblock.o
-LIB_OBJS += compat/obstack.o
 LIB_OBJS += compat/terminal.o
 LIB_OBJS += compat/zlib-uncompress2.o
 LIB_OBJS += config.o
@@ -1090,7 +1089,6 @@ LIB_OBJS += hex.o
 LIB_OBJS += hook.o
 LIB_OBJS += ident.o
 LIB_OBJS += json-writer.o
-LIB_OBJS += kwset.o
 LIB_OBJS += levenshtein.o
 LIB_OBJS += line-log.o
 LIB_OBJS += line-range.o
@@ -1379,7 +1377,6 @@ BUILTIN_OBJS += builtin/write-tree.o
 THIRD_PARTY_SOURCES += compat/inet_ntop.c
 THIRD_PARTY_SOURCES += compat/inet_pton.c
 THIRD_PARTY_SOURCES += compat/nedmalloc/%
-THIRD_PARTY_SOURCES += compat/obstack.%
 THIRD_PARTY_SOURCES += compat/poll/%
 THIRD_PARTY_SOURCES += compat/regex/%
 THIRD_PARTY_SOURCES += sha1collisiondetection/%