From 7b90ab467a658b2fb1b7c15c7d634e06f35f4ef2 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 2 Feb 2022 02:37:29 +0000 Subject: log: clean unneeded objects during `log --remerge-diff` The --remerge-diff option will need to create new blobs and trees representing the "automatic merge" state. If one is traversing a long project history, one can easily get hundreds of thousands of loose objects generated during `log --remerge-diff`. However, none of those loose objects are needed after we have completed our diff operation; they can be summarily deleted. Add a new helper function to tmp_objdir to discard all the contained objects, and call it after each merge is handled. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- revision.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'revision.h') diff --git a/revision.h b/revision.h index 13178e6b8f..44efce3f41 100644 --- a/revision.h +++ b/revision.h @@ -318,6 +318,9 @@ struct rev_info { /* misc. flags related to '--no-kept-objects' */ unsigned keep_pack_cache_flags; + + /* Location where temporary objects for remerge-diff are written. */ + struct tmp_objdir *remerge_objdir; }; int ref_excluded(struct string_list *, const char *path); -- cgit v1.2.1