tag.c: implement '--merged' and '--no-merged' options

diff --git a/ref-filter.c b/ref-filter.c
index c039fc891bdfbbc43ff549291536a3f129dd0676..fd839ac4b337d3498201a7fdf3b80d0409258c6c 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1159,11 +1159,35 @@ static int commit_contains(struct ref_filter *filter, struct commit *commit)
        return is_descendant_of(commit, filter->with_commit);
 }
 
+/*
+ * Return 1 if the refname matches one of the patterns, otherwise 0.
+ * A pattern can be a literal prefix (e.g. a refname "refs/heads/master"
+ * matches a pattern "refs/heads/mas") or a wildcard (e.g. the same ref
+ * matches "refs/heads/mas*", too).
+ */
+static int match_pattern(const char **patterns, const char *refname)
+{
+       /*
+        * When no '--format' option is given we need to skip the prefix
+        * for matching refs of tags and branches.
+        */
+       (void)(skip_prefix(refname, "refs/tags/", &refname) ||
+              skip_prefix(refname, "refs/heads/", &refname) ||
+              skip_prefix(refname, "refs/remotes/", &refname) ||
+              skip_prefix(refname, "refs/", &refname));
+
+       for (; *patterns; patterns++) {
+               if (!wildmatch(*patterns, refname, 0, NULL))
+                       return 1;
+       }
+       return 0;
+}
+
 /*
  * Return 1 if the refname matches one of the patterns, otherwise 0.
  * A pattern can be path prefix (e.g. a refname "refs/heads/master"
- * matches a pattern "refs/heads/") or a wildcard (e.g. the same ref
- * matches "refs/heads/m*",too).
+ * matches a pattern "refs/heads/" but not "refs/heads/m") or a
+ * wildcard (e.g. the same ref matches "refs/heads/m*", too).
  */
 static int match_name_as_path(const char **pattern, const char *refname)
 {
@@ -1184,6 +1208,16 @@ static int match_name_as_path(const char **pattern, const char *refname)
        return 0;
 }
 
+/* Return 1 if the refname matches one of the patterns, otherwise 0. */
+static int filter_pattern_match(struct ref_filter *filter, const char *refname)
+{
+       if (!*filter->name_patterns)
+               return 1; /* No pattern always matches */
+       if (filter->match_as_path)
+               return match_name_as_path(filter->name_patterns, refname);
+       return match_pattern(filter->name_patterns, refname);
+}
+
 /*
  * Given a ref (sha1, refname), check if the ref belongs to the array
  * of sha1s. If the given ref is a tag, check if the given tag points
@@ -1286,7 +1320,7 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
        if (!(kind & filter->kind))
                return 0;
 
-       if (*filter->name_patterns && !match_name_as_path(filter->name_patterns, refname))
+       if (!filter_pattern_match(filter, refname))
                return 0;
 
        if (filter->points_at.nr && !match_points_at(&filter->points_at, oid->hash, refname))