subtree: improve decision on merges kept in split

diff --git a/commit-reach.h b/commit-reach.h
index 13dec25cee40fa2519967303c63009d0bc84cb95..7d313e2975a28ef79b2ccf6dea965d4f139eda58 100644 (file)
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -59,4 +59,19 @@ define_commit_slab(contains_cache, enum contains_result);
 int commit_contains(struct ref_filter *filter, struct commit *commit,
                    struct commit_list *list, struct contains_cache *cache);
 
+/*
+ * Determine if every commit in 'from' can reach at least one commit
+ * that is marked with 'with_flag'. As we traverse, use 'assign_flag'
+ * as a marker for commits that are already visited. Do not walk
+ * commits with date below 'min_commit_date' or generation below
+ * 'min_generation'.
+ */
+int can_all_from_reach_with_flag(struct object_array *from,
+                                unsigned int with_flag,
+                                unsigned int assign_flag,
+                                time_t min_commit_date,
+                                uint32_t min_generation);
+int can_all_from_reach(struct commit_list *from, struct commit_list *to,
+                      int commit_date_cutoff);
+
 #endif