From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [RFC/PATCH 9/9] tag.c: implement '--merged' and '--no-merged' options Date: Thu, 25 Jun 2015 17:13:16 +0530 Message-ID: <1435232596-27466-9-git-send-email-karthik.188@gmail.com> References: <1435232596-27466-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 Thu Jun 25 13:44:28 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 1Z85Zx-0006dH-MC for gcvg-git-2@plane.gmane.org; Thu, 25 Jun 2015 13:44:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751817AbbFYLoW (ORCPT ); Thu, 25 Jun 2015 07:44:22 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:34377 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751650AbbFYLoS (ORCPT ); Thu, 25 Jun 2015 07:44:18 -0400 Received: by pdbep18 with SMTP id ep18so30164444pdb.1 for ; Thu, 25 Jun 2015 04:44:18 -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=J96yV3jSwUEskDHKmy5A5IFcz19rdXSS3Gpjybh80M4=; b=VQhIAh/vMyNdKR7EQbKm7WeSvYC8g8qPWr6sah5LVsHt5cVyMSm5QMChWSziLCMyxi nrA14UrZD7MTOOmMb3uKNXkLF26LNUB3lMiXHY43MOWcZ6IuNh3wSW3CwZz1QVoIa55m FYcbKNK952yJgTSKhOTxdVQhFBkt/zgv5bNuS/745dJ6HCUAYtY+zXNZ0FyrzK/A+Ufl gHs30qvaGTzIUU2eQBxUnCIKyeGVWSDH9Pv1rQuHiGc60wl7HSKbyk6L0QYe+aOOs/oM DxJoPNwUjjwMS4tmfPVjZsxze+NSnrMISr76SG3F24A2qB7r4MzITwBtcIEdlpjGIbGc J2oQ== X-Received: by 10.70.118.73 with SMTP id kk9mr91024579pdb.150.1435232657945; Thu, 25 Jun 2015 04:44:17 -0700 (PDT) Received: from ashley.localdomain ([106.51.130.23]) by mx.google.com with ESMTPSA id xn2sm11575446pbc.44.2015.06.25.04.44.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jun 2015 04:44:17 -0700 (PDT) X-Mailer: git-send-email 2.4.4 In-Reply-To: <1435232596-27466-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: 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 | 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 ... 'git tag' [-n[]] -l [--contains ] [--points-at ] [--column[=] | --no-column] [--sort=] [--format=] - [...] + [(--merged | --no-merged) []] [...] 'git tag' -v ... 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 []:: + Only list tags whose tips are reachable from the + specified commit (HEAD if not specified). + +--no-merged []:: + 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 ] [-f] [-m | -F ] []"), N_("git tag -d ..."), N_("git tag -l [-n[]] [--contains ] [--points-at ]" - "\n\t\t[...]"), + "\n\t\t[--merged []] [--no-merged []] [...]"), N_("git tag -v ..."), 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