[PATCH] tag: fix some mis-organized options in "-h" listing

Jeff King· Mar 12, 2015, 18:15 UTC · lore

Running "git tag -h" currently prints:

  [...]
  Tag creation options
      [...]
      --column[=<style>]    show tag list in columns
      --sort <type>         sort tags

  Tag listing options
      --contains <commit>   print only tags that contain the commit
      --points-at <object>  print only tags of the object

The "--column" and "--sort" options should go under the "Tag listing" group.

Signed-off-by: Jeff King <peff@peff.net>
---
 builtin/tag.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to builtin/tag.c +2 −2

diff --git a/builtin/tag.c b/builtin/tag.c
index 4194b9a..6f07ac6 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -605,13 +605,13 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_STRING('u', "local-user", &keyid, N_("key-id"),
 					N_("use another key to sign the tag")),
 		OPT__FORCE(&force, N_("replace the tag if exists")),
+
+		OPT_GROUP(N_("Tag listing options")),
 		OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
 		{
 			OPTION_CALLBACK, 0, "sort", &tag_sort, N_("type"), N_("sort tags"),
 			PARSE_OPT_NONEG, parse_opt_sort
 		},
-
-		OPT_GROUP(N_("Tag listing options")),
 		{
 			OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
 			N_("print only tags that contain the commit"),

-- 
2.3.2.472.geadab3c

Junio C Hamano· Mar 12, 2015, 19:10 UTC · re: Jeff King · lore

Re: [PATCH] tag: fix some mis-organized options in "-h" listing

Thanks.

Even though this dates back to d96e3c15 (tag: add --column, 2012-04-13), I do not think it is worth backporting it to v1.7.x series, so I'll queue the fix for a bit newer maintenance track, perhaps for v2.1.x and above.

patchtag: fix some mis-organized options in "-h" listing