diff options
Diffstat (limited to 'ref-filter.h')
| -rw-r--r-- | ref-filter.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ref-filter.h b/ref-filter.h index 8ecc33cdfa..2d13928455 100644 --- a/ref-filter.h +++ b/ref-filter.h @@ -23,6 +23,9 @@ #define FILTER_REFS_DETACHED_HEAD 0x0020 #define FILTER_REFS_KIND_MASK (FILTER_REFS_ALL | FILTER_REFS_DETACHED_HEAD) +#define DO_MERGE_FILTER_UNREACHABLE 0 +#define DO_MERGE_FILTER_REACHABLE 1 + struct atom_value; struct ref_sorting { @@ -54,13 +57,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, |