From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v10 13/13] tag.c: implement '--merged' and '--no-merged' options Date: Sun, 9 Aug 2015 20:02:41 +0530 Message-ID: <1439130761-15721-3-git-send-email-Karthik.188@gmail.com> References: <1439129506-9989-1-git-send-email-Karthik.188@gmail.com> Cc: christian.couder@gmail.com, Matthieu.Moy@grenoble-inp.fr, gitster@pobox.com, Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Aug 09 16:32:50 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZOReb-0005ia-TM for gcvg-git-2@plane.gmane.org; Sun, 09 Aug 2015 16:32:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754579AbbHIOcq (ORCPT ); Sun, 9 Aug 2015 10:32:46 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:34758 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754449AbbHIOco (ORCPT ); Sun, 9 Aug 2015 10:32:44 -0400 Received: by pawu10 with SMTP id u10so121599579paw.1 for ; Sun, 09 Aug 2015 07:32:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pI6oocgVcIvlN8ku65v4V54IY2oGxevbKIcSRcD+9us=; b=OGUeM1qIimEbxAiYd00mcmT8GkmKvwutYTwCDguMPeAZ58wWYACir1iWWxuCR5nh8J k+iWSXVBTXrFojDRYKUfxPLx65605AybohuvHR8P9jhSyfKRSwkeDg8zQslOrwMkGPuc POKC8RiyLsjYCd+Bm8SdT0TY8RXsMLQpfoZHKWv0f0V2+3jVLvc6+/FYygLern3n5JsH owpH5Tcog6IIL4WnWUeSzHnr0UtcHtslIyrkAJPNWQQ67ctpRqZvjHJbIpQQDVKyI7ZY kC7awQnO/3OksfRqlzDGKQnm5PZ0J3oin98hqxAmyvfAO6MP0dqEFTvTJbnSN9WohwYu +DEg== X-Received: by 10.66.186.195 with SMTP id fm3mr35011974pac.91.1439130764258; Sun, 09 Aug 2015 07:32:44 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by smtp.gmail.com with ESMTPSA id d13sm16625718pbu.51.2015.08.09.07.32.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 09 Aug 2015 07:32:43 -0700 (PDT) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.5.0 In-Reply-To: <1439129506-9989-1-git-send-email-Karthik.188@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Karthik Nayak 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 Mentored-by: Matthieu Moy Signed-off-by: Karthik Nayak --- 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 75703c5..c2785d9 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -14,7 +14,7 @@ SYNOPSIS 'git tag' -d ... 'git tag' [-n[]] -l [--contains ] [--points-at ] [--column[=] | --no-column] [--create-reflog] [--sort=] - [--format=] [...] + [--format=] [--[no-]merged []] [...] 'git tag' -v ... DESCRIPTION @@ -171,6 +171,11 @@ This option is only applicable when listing tags without annotation lines. `%0a` to `\n` (LF). The fields are same as those in `git for-each-ref`. +--[no-]merged []:: + Only list tags whose tips are reachable, or not reachable + if '--no-merged' is used, from the specified commit ('HEAD' + if not specified). + CONFIGURATION ------------- diff --git a/builtin/tag.c b/builtin/tag.c index affb460..22efbba 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 ] [-f] [-m | -F ] []"), N_("git tag -d ..."), N_("git tag -l [-n[]] [--contains ] [--points-at ]" - "\n\t\t[...]"), + "\n\t\t[--[no-]merged []] [...]"), N_("git tag -v ..."), 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 1809011..5b73539 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1535,4 +1535,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