summaryrefslogtreecommitdiffstats
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-01-16 19:11:58 +0100
committerJunio C Hamano <gitster@pobox.com>2024-01-16 19:11:58 +0100
commit4cc0f8e8fa3694fdef632784592fc8af63022618 (patch)
tree7754f7dc32d60686444ddd5081dbc0d3a8742b9b /merge-recursive.h
parentMerge branch 'jk/index-pack-lsan-false-positive-fix' (diff)
parentcommit-graph: retain commit slab when closing NULL commit_graph (diff)
downloadgit-4cc0f8e8fa3694fdef632784592fc8af63022618.tar.xz
git-4cc0f8e8fa3694fdef632784592fc8af63022618.zip
Merge branch 'jk/commit-graph-slab-clear-fix'
Clearing in-core repository (happens during e.g., "git fetch --recurse-submodules" with commit graph enabled) made in-core commit object in an inconsistent state by discarding the necessary data from commit-graph too early, which has been corrected. * jk/commit-graph-slab-clear-fix: commit-graph: retain commit slab when closing NULL commit_graph
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions