kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/ref-filter-discard-commit-buffer' 

* jk/ref-filter-discard-commit-buffer:
  ref-filter: disable save_commit_buffer while traversing
maint
Junio C Hamano 2022-07-19 16:40:17 -07:00
parent cf92cb29e9 359b01ca84
commit 40ab711a9c
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ref-filter.c
View File

@ -2405,6 +2405,7 @@ static void reach_filter(struct ref_array *array,
int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type)
{
struct ref_filter_cbdata ref_cbdata;
int save_commit_buffer_orig;
int ret = 0;

ref_cbdata.array = array;
@ -2412,6 +2413,9 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int

filter->kind = type & FILTER_REFS_KIND_MASK;

save_commit_buffer_orig = save_commit_buffer;
save_commit_buffer = 0;

init_contains_cache(&ref_cbdata.contains_cache);
init_contains_cache(&ref_cbdata.no_contains_cache);

@ -2444,6 +2448,7 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
reach_filter(array, filter->reachable_from, INCLUDE_REACHED);
reach_filter(array, filter->unreachable_from, EXCLUDE_REACHED);

save_commit_buffer = save_commit_buffer_orig;
return ret;
}