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,
	Karthik Nayak <karthik.188@gmail.com>
Subject: [PATCH v2 11/11] for-each-ref: add '--contains' option
Date: Sun, 14 Jun 2015 01:48:26 +0530	[thread overview]
Message-ID: <1434226706-3764-11-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1434226706-3764-1-git-send-email-karthik.188@gmail.com>

Add the '--contains' option provided by 'ref-filter'. The '--contains'
option lists only refs which are contain the mentioned commit (HEAD if
no commit is explicitly given).

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-for-each-ref.txt |  5 +++++
 builtin/for-each-ref.c             |  2 ++
 t/t6301-for-each-ref-filter.sh     | 13 +++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index d61a756..7a949f3 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -11,6 +11,7 @@ SYNOPSIS
 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
 		   [(--sort=<key>)...] [--format=<format>] [<pattern>...]
 		   [--points-at <object>] [(--merged | --no-merged) <object>]
+		   [--contains <object>]
 
 DESCRIPTION
 -----------
@@ -74,6 +75,10 @@ OPTIONS
 	Only list refs whose tips are not reachable from the
 	specified commit (HEAD if not specified).
 
+--contains [<commit>]::
+	Only list tags which contain the specified commit (HEAD if not
+	specified).
+
 FIELD NAMES
 -----------
 
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 00913f4..8ccbb1c 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -9,6 +9,7 @@ static char const * const for_each_ref_usage[] = {
 	N_("git for-each-ref [<options>] [<pattern>]"),
 	N_("git for-each-ref [--points-at <object>]"),
 	N_("git for-each-ref [(--merged | --no-merged) <object>]"),
+	N_("git for-each-ref [--contains <object>]"),
 	NULL
 };
 
@@ -41,6 +42,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 			     parse_opt_object_name),
 		OPT_MERGED(&filter, N_("print only refs that are merged")),
 		OPT_NO_MERGED(&filter, N_("print only refs that are not merged")),
+		OPT_CONTAINS(&filter.with_commit, N_("print only refs which contain the commit")),
 		OPT_END(),
 	};
 
diff --git a/t/t6301-for-each-ref-filter.sh b/t/t6301-for-each-ref-filter.sh
index 3ed97bd..17cf7b0 100644
--- a/t/t6301-for-each-ref-filter.sh
+++ b/t/t6301-for-each-ref-filter.sh
@@ -63,4 +63,17 @@ test_expect_success 'filtering with --no-merged' '
 	test_cmp expect actual
 '
 
+test_expect_success 'filtering with --contains' '
+	cat >expect <<-\EOF &&
+	refs/heads/master
+	refs/heads/side
+	refs/odd/spot
+	refs/tags/four
+	refs/tags/three
+	refs/tags/two
+	EOF
+	git for-each-ref --format="%(refname)" --contains=two >actual &&
+	test_cmp expect actual
+'
+
 test_done
-- 
2.4.3.435.g2403634.dirty

  parent reply	other threads:[~2015-06-13 20:19 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-13 20:17 [PATCH v2 00/11] add options to for-each-ref karthik nayak
2015-06-13 20:18 ` [PATCH v2 01/11] t6301: for-each-ref tests for ref-filter APIs Karthik Nayak
2015-06-13 20:18   ` [PATCH v2 02/11] tag: libify parse_opt_points_at() Karthik Nayak
2015-06-13 20:18   ` [PATCH v2 03/11] ref-filter: implement '--points-at' option Karthik Nayak
2015-06-13 20:18   ` [PATCH v2 04/11] for-each-ref: add " Karthik Nayak
2015-06-13 20:18   ` [PATCH v2 05/11] ref-filter: add parse_opt_merge_filter() Karthik Nayak
2015-06-14  5:49     ` Christian Couder
2015-06-14  6:49       ` karthik nayak
2015-06-13 20:18   ` [PATCH v2 06/11] ref-filter: implement '--merged' and '--no-merged' options Karthik Nayak
2015-06-13 20:18   ` [PATCH v2 07/11] for-each-ref: add " Karthik Nayak
2015-06-13 20:18   ` [PATCH v2 08/11] parse-option: rename parse_opt_with_commit() Karthik Nayak
2015-06-13 20:18   ` [PATCH v2 09/11] parse-options.h: add macros for '--contains' option Karthik Nayak
2015-06-14  6:13     ` Christian Couder
2015-06-14  6:58       ` karthik nayak
2015-06-15 19:27       ` Junio C Hamano
2015-06-15 20:49         ` karthik nayak
2015-06-13 20:18   ` [PATCH v2 10/11] ref-filter: implement " Karthik Nayak
2015-06-13 20:18   ` Karthik Nayak [this message]
2015-06-14  8:12   ` [PATCH v2 01/11] t6301: for-each-ref tests for ref-filter APIs Matthieu Moy
2015-06-14  8:32     ` karthik nayak

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=1434226706-3764-11-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 \
    /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).