ref-filter: implement '--merged' and '--no-merged' options

diff --git a/ref-filter.h b/ref-filter.h
index 443cfa7179290c821ee75820a9715047b8057906..f1151749a8022794df3e55196a8083e77c2a3f17 100644 (file)
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -31,6 +31,7 @@ struct ref_array_item {
        unsigned char objectname[20];
        int flag;
        const char *symref;
+       struct commit *commit;
        struct atom_value *value;
        char refname[FLEX_ARRAY];
 };
@@ -43,6 +44,13 @@ struct ref_array {
 struct ref_filter {
        const char **name_patterns;
        struct sha1_array points_at;
+
+       enum {
+               REF_FILTER_MERGED_NONE = 0,
+               REF_FILTER_MERGED_INCLUDE,
+               REF_FILTER_MERGED_OMIT
+       } merge;
+       struct commit *merge_commit;
 };
 
 struct ref_filter_cbdata {