[PATCH v14 13/13] tag.c: implement '--merged' and '--no-merged' options

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

From: Karthik Nayak <karthik.188@gmail.com>
To: git@vger.kernel.org
Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr,
	gitster@pobox.com, Karthik Nayak <Karthik.188@gmail.com>,
	Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v14 13/13] tag.c: implement '--merged' and '--no-merged' options
Date: Sat, 29 Aug 2015 19:42:17 +0530	[thread overview]
Message-ID: <1440857537-13968-14-git-send-email-Karthik.188@gmail.com> (raw)
In-Reply-To: <1440857537-13968-1-git-send-email-Karthik.188@gmail.com>

Use 'ref-filter' APIs to 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 |  7 ++++++-
 builtin/tag.c             |  6 +++++-
 t/t7004-tag.sh            | 27 +++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 0c7f4e6..3803bf7 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] [--create-reflog] [--sort=<key>]
-	[--format=<format>] [<pattern>...]
+	[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]
 'git tag' -v <tagname>...
 
 DESCRIPTION
@@ -165,6 +165,11 @@ This option is only applicable when listing tags without annotation lines.
 	that of linkgit:git-for-each-ref[1].  When unspecified,
 	defaults to `%(refname:short)`.
 
+--[no-]merged [<commit>]::
+	Only list tags whose tips are reachable, or not reachable
+	if '--no-merged' is used, from the specified commit ('HEAD'
+	if not specified).
+
 CONFIGURATION
 -------------
 By default, 'git tag' in sign-with-default mode (-s) will use your
diff --git a/builtin/tag.c b/builtin/tag.c
index dc4494d..9fa1400 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[--format=<format>] [<pattern>...]"),
+		"\n\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"),
 	N_("git tag -v <tagname>..."),
 	NULL
 };
@@ -358,6 +358,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),
 		{
@@ -416,6 +418,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 8987fb1..3dd2f51 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1531,4 +1531,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.5.0

next prev parent reply	other threads:[~2015-08-29 14:13 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-29 14:12 [PATCH v14 00/13] Port tag.c to use ref-filter.c Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 01/13] ref-filter: move `struct atom_value` to ref-filter.c Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 02/13] ref-filter: introduce ref_formatting_state and ref_formatting_stack Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 03/13] utf8: add function to align a string into given strbuf Karthik Nayak
2015-08-29 17:10   ` Torsten Bögershausen
2015-08-29 17:33     ` Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 04/13] ref-filter: implement an `align` atom Karthik Nayak
2015-08-30  3:27   ` Eric Sunshine
2015-08-30 13:38     ` Karthik Nayak
2015-08-30 22:10       ` Eric Sunshine
2015-08-31  9:55         ` Karthik Nayak
2015-08-31 17:16           ` Eric Sunshine
2015-08-31 17:28             ` Matthieu Moy
2015-08-31 18:02               ` Eric Sunshine
2015-09-01 13:05                 ` Karthik Nayak
2015-09-01 13:11                   ` Matthieu Moy
2015-09-01 15:13                     ` Karthik Nayak
2015-08-30 14:57     ` Karthik Nayak
2015-08-30 21:59       ` Eric Sunshine
2015-08-31 10:06         ` Karthik Nayak
2015-08-30 17:27     ` Junio C Hamano
2015-08-30 22:56       ` Eric Sunshine
2015-08-31 10:14         ` Karthik Nayak
2015-08-31 10:28           ` Karthik Nayak
2015-08-31  8:30   ` Matthieu Moy
2015-08-31 10:59     ` Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 05/13] ref-filter: add option to filter out tags, branches and remotes Karthik Nayak
2015-08-30  3:30   ` Eric Sunshine
2015-08-30  6:51     ` Karthik Nayak
2015-08-30  7:16       ` Eric Sunshine
2015-08-29 14:12 ` [PATCH v14 06/13] ref-filter: introduce format_ref_array_item() Karthik Nayak
2015-08-30  3:42   ` Eric Sunshine
2015-08-30  6:39     ` Karthik Nayak
2015-08-30  6:49     ` Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 07/13] ref-filter: add support for %(contents:lines=X) Karthik Nayak
2015-08-30  7:53   ` Eric Sunshine
2015-08-30 17:02     ` Karthik Nayak
2015-08-30 17:09       ` Eric Sunshine
2015-08-30 17:17         ` Karthik Nayak
2015-08-30 22:13   ` Eric Sunshine
2015-08-31  4:43     ` Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 08/13] ref-filter: add support to sort by version Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 09/13] ref-filter: add option to match literal pattern Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 10/13] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 11/13] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-08-29 14:12 ` [PATCH v14 12/13] tag.c: implement '--format' option Karthik Nayak
2015-08-29 14:12 ` Karthik Nayak [this message]
2015-08-31  6:50 ` [PATCH v14 00/13] Port tag.c to use ref-filter.c Matthieu Moy
2015-08-31 11:09   ` Karthik Nayak
2015-08-31  7:31 ` Matthieu Moy
2015-08-31 11:36   ` Karthik Nayak
2015-09-01 17:37     ` Karthik Nayak

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:0c7f4e6 dfblob:3803bf7 dfblob:dc4494d dfblob:9fa1400
dfblob:8987fb1 dfblob:3dd2f51 )
 OR (
bs:"[PATCH v14 13/13] tag.c: implement '--merged' and '--no-merged' options" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1440857537-13968-14-git-send-email-Karthik.188@gmail.com \
    --to=karthik.188@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).