Merge branch 'jc/cocci-preincr' into maint

diff --git a/commit.h b/commit.h
index 12b8b2d6543c758a6e96c0ba2ee287ef0d048e77..dc5107259fd090cb33d9b25d4bf8530108d7109e 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -256,7 +256,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 *);