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>
Subject: [RFC/PATCH 9/9] tag.c: implement '--merged' and '--no-merged' options
Date: Thu, 25 Jun 2015 17:13:16 +0530 [thread overview]
Message-ID: <1435232596-27466-9-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1435232596-27466-1-git-send-email-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 | 9 +++++----
t/t7004-tag.sh | 27 +++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 5 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 91356c9..9a1f7a5 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
};
@@ -35,9 +35,6 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, con
struct ref_array array;
int i;
- if (!format)
- check_format = 1;
-
memset(&array, 0, sizeof(array));
if (filter->lines == -1)
@@ -352,6 +349,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),
{
@@ -412,6 +411,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.4
next prev parent reply other threads:[~2015-06-25 11:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-25 9:55 [RFC/PATCH 0/9] port tag.c to use ref-filter library Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 1/9] ref-filter: add %(refname:lalignX) option Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 2/9] ref-filter: add option to filter only tags Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 3/9] ref-filter: support printing N lines from tag annotation Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 4/9] ref-filter: add support to sort by version Karthik Nayak
2015-07-12 9:09 ` Duy Nguyen
2015-07-12 13:37 ` Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 5/9] ref-filter: add option to match literal pattern Karthik Nayak
2015-06-26 21:15 ` Karthik Nayak
2015-06-29 18:20 ` Junio C Hamano
2015-06-30 13:36 ` Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 6/9] tag.c: use 'ref-filter' data structures Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 7/9] tag.c: use 'ref-filter' APIs Karthik Nayak
2015-06-25 11:43 ` [RFC/PATCH 8/9] tag.c: implement '--format' option Karthik Nayak
2015-06-25 13:03 ` Karthik Nayak
2015-06-25 11:43 ` Karthik Nayak [this message]
2015-06-27 20:02 ` [RFC/PATCH 1/9] ref-filter: add %(refname:lalignX) option Christian Couder
2015-06-28 4:53 ` Christian Couder
2015-06-28 6:59 ` Karthik Nayak
2015-06-27 23:43 ` Duy Nguyen
2015-06-28 7:39 ` Junio C Hamano
2015-06-28 9:13 ` Karthik Nayak
2015-06-29 4:44 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435232596-27466-9-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).