Merge branch 'jc/tag-contains-with'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 20:51:14 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 20:51:15 +0000 (13:51 -0700)
* jc/tag-contains-with:
tag: grok "--with" as synonym to "--contains"

1  2 
builtin/tag.c
diff --combined builtin/tag.c
index 169c676636ff6b320f32f13126a5ff46b222f879,74d599c2d9d581d5889bcf19b26ab1262dd3c267..b7d9632867c06984a41ed14f4e13a58da4f457a4
@@@ -42,7 -42,7 +42,7 @@@ static int match_pattern(const char **p
        if (!*patterns)
                return 1;
        for (; *patterns; patterns++)
 -              if (!fnmatch(*patterns, ref, 0))
 +              if (!wildmatch(*patterns, ref, 0, NULL))
                        return 1;
        return 0;
  }
@@@ -470,6 -470,12 +470,12 @@@ int cmd_tag(int argc, const char **argv
                        PARSE_OPT_LASTARG_DEFAULT,
                        parse_opt_with_commit, (intptr_t)"HEAD",
                },
+               {
+                       OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
+                       N_("print only tags that contain the commit"),
+                       PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
+                       parse_opt_with_commit, (intptr_t)"HEAD",
+               },
                {
                        OPTION_CALLBACK, 0, "points-at", NULL, N_("object"),
                        N_("print only tags of the object"), 0, parse_opt_points_at