From 2588f6ed8bd4e31c1ea1ae35f9f668452b46f1ef Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 24 Oct 2018 08:56:12 -0700 Subject: shallow: offer to prune only non-existing entries The `prune_shallow()` function wants a full reachability check to be completed before it goes to work, to ensure that all unreachable entries are removed from the shallow file. However, in the upcoming patch we do not even want to go that far. We really only need to remove entries corresponding to pruned commits, i.e. to commits that no longer exist. Let's support that use case. Rather than extending the signature of `prune_shallow()` to accept another Boolean, let's turn it into a bit field and declare constants, for readability. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- commit.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'commit.h') diff --git a/commit.h b/commit.h index da0db36eba..861a159314 100644 --- a/commit.h +++ b/commit.h @@ -255,7 +255,9 @@ extern void assign_shallow_commits_to_refs(struct shallow_info *info, uint32_t **used, int *ref_status); extern int delayed_reachability_test(struct shallow_info *si, int c); -extern void prune_shallow(int show_only); +#define PRUNE_SHOW_ONLY 1 +#define PRUNE_QUICK 2 +extern void prune_shallow(unsigned options); extern struct trace_key trace_shallow; int is_descendant_of(struct commit *, struct commit_list *); -- cgit v1.2.3