git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 9/9] tag.c: implement '--merged' and '--no-merged' options

From
Karthik Nayak <karthik.188@gmail.com>
Date
Jul 18, 2015, 22:00 UTC
Message-ID
<1437256837-13378-3-git-send-email-Karthik.188@gmail.com>
In-Reply-To
<1437256837-13378-1-git-send-email-Karthik.188@gmail.com>
From: Karthik Nayak <karthik.188@gmail.com>

Using 'ref-filter' APIs implement the '--merged' and '--no-merged' options into 'tag.c'. The '--merged' option lets the user to only list tags merged into the named commit. The '--no-merged' option lets the user to only list tags not merged into the named commit. If no object is provided it assumes HEAD as the object.

Add documentation and tests for the same.
Mentored-by: Christian Couder <christian.couder@gmail.com>
Mentored-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
---
 Documentation/git-tag.txt | 10 +++++++++-
 builtin/tag.c             |  6 +++++-
 t/t7004-tag.sh            | 27 +++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 16e396c..74ed157 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 'git tag' -d <tagname>...
 'git tag' [-n[<num>]] -l [--contains <commit>] [--points-at <object>]
 	[--column[=<options>] | --no-column] [--sort=<key>] [--format=<format>]
-	[<pattern>...]
+	[(--merged | --no-merged) [<commit>]] [<pattern>...]
 'git tag' -v <tagname>...
 
 DESCRIPTION
@@ -169,6 +169,14 @@ This option is only applicable when listing tags without annotation lines.
 	`%09` to `\t` (TAB) and `%0a` to `\n` (LF).
 	The fields are same as those in `git for-each-ref`.
 
+--merged [<commit>]::
+	Only list tags whose tips are reachable from the
+	specified commit (HEAD if not specified).
+
+--no-merged [<commit>]::
+	Only list tags whose tips are not reachable from the
+	specified commit (HEAD if not specified).
+
 
 CONFIGURATION
 -------------
diff --git a/builtin/tag.c b/builtin/tag.c
index cae113b..0fa1d31 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -23,7 +23,7 @@ static const char * const git_tag_usage[] = {
 	N_("git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<head>]"),
 	N_("git tag -d <tagname>..."),
 	N_("git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]"
-		"\n\t\t[<pattern>...]"),
+		"\n\t\t[--merged [<commit>]] [--no-merged [<commit>]] [<pattern>...]"),
 	N_("git tag -v <tagname>..."),
 	NULL
 };
@@ -353,6 +353,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),
 		OPT_CONTAINS(&filter.with_commit, N_("print only tags that contain the commit")),
 		OPT_WITH(&filter.with_commit, N_("print only tags that contain the commit")),
+		OPT_MERGED(&filter, N_("print only tags that are merged")),
+		OPT_NO_MERGED(&filter, N_("print only tags that are not merged")),
 		OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"),
 			     N_("field name to sort on"), &parse_opt_ref_sorting),
 		{
@@ -413,6 +415,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		die(_("--contains option is only allowed with -l."));
 	if (filter.points_at.nr)
 		die(_("--points-at option is only allowed with -l."));
+	if (filter.merge_commit)
+		die(_("--merged and --no-merged option are only allowed with -l"));
 	if (cmdmode == 'd')
 		return for_each_tag_name(argv, delete_tag);
 	if (cmdmode == 'v')
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index e8cebb6..873aad3 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1523,4 +1523,31 @@ test_expect_success '--format should list tags as per format given' '
 	test_cmp expect actual
 '
 
+test_expect_success 'setup --merged test tags' '
+	git tag mergetest-1 HEAD~2 &&
+	git tag mergetest-2 HEAD~1 &&
+	git tag mergetest-3 HEAD
+'
+
+test_expect_success '--merged cannot be used in non-list mode' '
+	test_must_fail git tag --merged=mergetest-2 foo
+'
+
+test_expect_success '--merged shows merged tags' '
+	cat >expect <<-\EOF &&
+	mergetest-1
+	mergetest-2
+	EOF
+	git tag -l --merged=mergetest-2 mergetest-* >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--no-merged show unmerged tags' '
+	cat >expect <<-\EOF &&
+	mergetest-3
+	EOF
+	git tag -l --no-merged=mergetest-2 mergetest-* >actual &&
+	test_cmp expect actual
+'
+
 test_done

-- 
2.4.6
Previous: Matthieu MoyNext: Christian Couder
Message 33 of 37 in “Port tag.c to use ref-filter APIs”
  1. 0/9 Port tag.c to use ref-filter APIsKarthik Nayak, Jul 18, 2015
  2. 1/9 ref-filter: add option to align atoms to the leftKarthik Nayak, Jul 18, 2015
  3. Eric SunshineJul 19, 2015
  4. Karthik NayakJul 20, 2015
  5. Junio C HamanoJul 20, 2015
  6. Eric SunshineJul 20, 2015
  7. Junio C HamanoJul 20, 2015
  8. Karthik NayakJul 20, 2015
  9. 1/9 ref-filter: add option to align atoms to the leftKarthik Nayak, Jul 20, 2015
  10. Eric SunshineJul 20, 2015
  11. Karthik NayakJul 20, 2015
  12. Junio C HamanoJul 20, 2015
  13. Karthik NayakJul 21, 2015
  14. Matthieu MoyJul 22, 2015
  15. Karthik NayakJul 23, 2015
  16. 2/9 ref-filter: add option to filter only tagsKarthik Nayak, Jul 18, 2015
  17. 3/9 ref-filter: support printing N lines from tag annotationKarthik Nayak, Jul 18, 2015
  18. Eric SunshineJul 20, 2015
  19. Karthik NayakJul 20, 2015
  20. 4/9 ref-filter: add support to sort by versionKarthik Nayak, Jul 18, 2015
  21. Eric SunshineJul 20, 2015
  22. Karthik NayakJul 20, 2015
  23. 5/9 ref-filter: add option to match literal patternKarthik Nayak, Jul 18, 2015
  24. Eric SunshineJul 20, 2015
  25. Christian CouderJul 20, 2015
  26. Eric SunshineJul 20, 2015
  27. Karthik NayakJul 21, 2015
  28. Matthieu MoyJul 22, 2015
  29. 6/9 tag.c: use 'ref-filter' data structuresKarthik Nayak, Jul 18, 2015
  30. 7/9 tag.c: use 'ref-filter' APIsKarthik Nayak, Jul 18, 2015
  31. 8/9 tag.c: implement '--format' optionKarthik Nayak, Jul 18, 2015
  32. Matthieu MoyJul 22, 2015
  33. 9/9 tag.c: implement '--merged' and '--no-merged' optionsKarthik Nayak, Jul 18, 2015
  34. Christian CouderJul 19, 2015
  35. Karthik NayakJul 21, 2015
  36. Matthieu MoyJul 22, 2015
  37. Karthik NayakJul 23, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.