Skip to content

Commit 40ab711

Browse files
committed
Merge branch 'jk/ref-filter-discard-commit-buffer'
* jk/ref-filter-discard-commit-buffer: ref-filter: disable save_commit_buffer while traversing
2 parents cf92cb2 + 359b01c commit 40ab711

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

ref-filter.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,13 +2405,17 @@ static void reach_filter(struct ref_array *array,
24052405
int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int type)
24062406
{
24072407
struct ref_filter_cbdata ref_cbdata;
2408+
int save_commit_buffer_orig;
24082409
int ret = 0;
24092410

24102411
ref_cbdata.array = array;
24112412
ref_cbdata.filter = filter;
24122413

24132414
filter->kind = type & FILTER_REFS_KIND_MASK;
24142415

2416+
save_commit_buffer_orig = save_commit_buffer;
2417+
save_commit_buffer = 0;
2418+
24152419
init_contains_cache(&ref_cbdata.contains_cache);
24162420
init_contains_cache(&ref_cbdata.no_contains_cache);
24172421

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

2451+
save_commit_buffer = save_commit_buffer_orig;
24472452
return ret;
24482453
}
24492454

0 commit comments

Comments
 (0)