summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-02 06:06:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-02 06:06:06 (GMT)
commit36dcb573374f267125a35a0d964707b527dd637d (patch)
treeddac88242f6b15e7b26bdd1fd83121c347864bbe /builtin/merge-base.c
parent7ef0d047386a1932dc4a8b1008d851b0fe47f978 (diff)
parent8df4c2953f228020438eb53a7d54470c922ce9cc (diff)
downloadgit-36dcb573374f267125a35a0d964707b527dd637d.zip
git-36dcb573374f267125a35a0d964707b527dd637d.tar.gz
git-36dcb573374f267125a35a0d964707b527dd637d.tar.bz2
Merge branch 'ab/grep-preparatory-cleanup'
The internal implementation of "git grep" has seen some clean-up. * 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 ...
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions