Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-05-07 06:47:38 +0300
committerJunio C Hamano <gitster@pobox.com>2021-05-07 06:47:38 +0300
commit6e08cbdf3857ea2b335c96f515743090ed58c709 (patch)
tree35f5dd2f320ba56fb3b37e4863b780bfcd4d4a8a /pack-bitmap.c
parente60e9cc20ea4723b299425271be3a78946659251 (diff)
parent2ba582ba4c62fae506174ce326deab082d962e63 (diff)
Merge branch 'jk/prune-with-bitmap-fix'
When the reachability bitmap is in effect, the "do not lose recently created objects and those that are reachable from them" safety to protect us from races were disabled by mistake, which has been corrected. * jk/prune-with-bitmap-fix: prune: save reachable-from-recent objects with bitmaps pack-bitmap: clean up include_check after use
Diffstat (limited to 'pack-bitmap.c')
-rw-r--r--pack-bitmap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 3ed15431cd..f2b59fbf48 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -631,6 +631,9 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
traverse_commit_list_filtered(filter, revs,
show_commit, show_object,
&show_data, NULL);
+
+ revs->include_check = NULL;
+ revs->include_check_data = NULL;
}
return base;