From 2a69ff09d5654de31361365e3faf9f8495f03ed7 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Thu, 17 Mar 2022 11:24:47 -0700 Subject: shallow: reset commit grafts when shallow is reset When reset_repository_shallow() is called, Git clears its cache of shallow information, so that if shallow information is re-requested, Git will read fresh data from disk instead of reusing its stale cached data. However, the cache of commit grafts is not likewise cleared, even though there are commit grafts created from shallow information. This means that if on-disk shallow information were to be updated and then a commit-graft-using codepath were run (for example, a revision walk), Git would be using stale commit graft information. This can be seen from the test in this patch, in which Git performs a revision walk (to check for changed submodules) after a fetch with --update-shallow. Therefore, clear the cache of commit grafts whenever reset_repository_shallow() is called. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano --- commit.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'commit.c') diff --git a/commit.c b/commit.c index 98b2e55665..ffcc4a97cd 100644 --- a/commit.c +++ b/commit.c @@ -249,6 +249,16 @@ int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data) return ret; } +void reset_commit_grafts(struct repository *r) +{ + int i; + + for (i = 0; i < r->parsed_objects->grafts_nr; i++) + free(r->parsed_objects->grafts[i]); + r->parsed_objects->grafts_nr = 0; + r->parsed_objects->commit_graft_prepared = 0; +} + struct commit_buffer { void *buffer; unsigned long size; -- cgit v1.2.3