Merge branch 'js/ghwf-setup-msbuild-update'

[thirdparty/git.git] / builtin / tag.c
diff --git a/builtin/tag.c b/builtin/tag.c

index 5cbd80dc3e93f478eb0ff47465a1e4b287b897d2..ecf011776dc057421ce4862fa894cb48525b2035 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -26,7 +26,7 @@ static const char * const git_tag_usage[] = {
                 "\t\t<tagname> [<head>]"),
         N_("git tag -d <tagname>..."),
         N_("git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
-               "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"),
+               "\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
         N_("git tag -v [--format=<format>] <tagname>..."),
         NULL
  };
@@ -457,8 +457,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                 if (argc == 0)
                         cmdmode = 'l';
                 else if (filter.with_commit || filter.no_commit ||
-                        filter.points_at.nr || filter.merge_commit ||
-                        filter.lines != -1)
+                        filter.reachable_from || filter.unreachable_from ||
+                        filter.points_at.nr || filter.lines != -1)
                         cmdmode = 'l';
         }
  
@@ -509,7 +509,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                 die(_("--no-contains option is only allowed in list mode"));
         if (filter.points_at.nr)
                 die(_("--points-at option is only allowed in list mode"));
-       if (filter.merge_commit)
+       if (filter.reachable_from || filter.unreachable_from)
                 die(_("--merged and --no-merged options are only allowed in list mode"));
         if (cmdmode == 'd')
                 return for_each_tag_name(argv, delete_tag, NULL);