diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-03-23 00:00:23 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-23 00:00:23 +0300 |
commit | 24119d9d7b686f8f4ad5ac91fab32fd3d4bb67f1 (patch) | |
tree | 3d45f46a26ee904890ceba996c8e012b988263f5 /builtin | |
parent | e8d5a423ca1af3d0ef863ce72108af181e9dd8fd (diff) | |
parent | c1760352e0b27cfbdffd97dec50a9eb552318993 (diff) |
Merge branch 'ab/grep-pcre2-allocfix'
Updates to memory allocation code around the use of pcre2 library.
* ab/grep-pcre2-allocfix:
grep/pcre2: move definitions of pcre2_{malloc,free}
grep/pcre2: move back to thread-only PCREv2 structures
grep/pcre2: actually make pcre2 use custom allocator
grep/pcre2: use pcre2_maketables_free() function
grep/pcre2: use compile-time PCREv2 version test
grep/pcre2: add GREP_PCRE2_DEBUG_MALLOC debug mode
grep/pcre2: prepare to add debugging to pcre2_malloc()
grep/pcre2: correct reference to grep_init() in comment
grep/pcre2: drop needless assignment to NULL
grep/pcre2: drop needless assignment + assert() on opt->pcre2
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/grep.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index ccd8d08f3d..5de725f904 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1181,6 +1181,5 @@ int cmd_grep(int argc, const char **argv, const char *prefix) run_pager(&opt, prefix); clear_pathspec(&pathspec); free_grep_patterns(&opt); - grep_destroy(); return !hit; } |