Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursive
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 May 2017 05:27:37 +0000 (14:27 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 May 2017 05:28:41 +0000 (14:28 +0900)
* ab/grep-preparatory-cleanup: (31 commits)
grep: assert that threading is enabled when calling grep_{lock,unlock}
grep: given --threads with NO_PTHREADS=YesPlease, warn
pack-objects: fix buggy warning about threads
pack-objects & index-pack: add test for --threads warning
test-lib: add a PTHREADS prerequisite
grep: move is_fixed() earlier to avoid forward declaration
grep: change internal *pcre* variable & function names to be *pcre1*
grep: change the internal PCRE macro names to be PCRE1
grep: factor test for \0 in grep patterns into a function
grep: remove redundant regflags assignments
grep: catch a missing enum in switch statement
perf: add a comparison test of log --grep regex engines with -F
perf: add a comparison test of log --grep regex engines
perf: add a comparison test of grep regex engines with -F
perf: add a comparison test of grep regex engines
perf: emit progress output when unpacking & building
perf: add a GIT_PERF_MAKE_COMMAND for when *_MAKE_OPTS won't do
grep: add tests to fix blind spots with \0 patterns
grep: prepare for testing binary regexes containing rx metacharacters
grep: add a test helper function for less verbose -f \0 tests
...

1  2 
builtin/pack-objects.c
revision.c
t/t4202-log.sh
t/test-lib.sh
Simple merge
diff --cc revision.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge
diff --cc t/test-lib.sh
Simple merge