strmap: enable allocations to come from a mem_pool

[thirdparty/git.git] / ref-filter.h

diff --git a/ref-filter.h b/ref-filter.h
index 8ecc33cdfa5006e34251131b0c6c93b335383809..feaef4a8fde70121cfb50ec9c7ba9a0e74354387 100644 (file)
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -54,13 +54,8 @@ struct ref_filter {
        struct oid_array points_at;
        struct commit_list *with_commit;
        struct commit_list *no_commit;
-
-       enum {
-               REF_FILTER_MERGED_NONE = 0,
-               REF_FILTER_MERGED_INCLUDE,
-               REF_FILTER_MERGED_OMIT
-       } merge;
-       struct commit *merge_commit;
+       struct commit_list *reachable_from;
+       struct commit_list *unreachable_from;
 
        unsigned int with_commit_tag_algo : 1,
                match_as_path : 1,