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: [RFC/PATCH 6/9] for-each-ref: add '--merged' and '--no-merged' options
Date: Sun,  7 Jun 2015 01:34:09 +0530	[thread overview]
Message-ID: <1433621052-5588-6-git-send-email-karthik.188@gmail.com> (raw)
In-Reply-To: <1433621052-5588-1-git-send-email-karthik.188@gmail.com>

Add the '--merged' and '--no-merged' options provided by 'ref-filter'.
The '--merged' option lets the user to only list refs merged into the
named commit. The '--no-merged' option lets the user to only list refs
not merged into the named commit.

Add documentation for the same.

Based-on-patch-by: Jeff King <peff@peff.net>
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 | 10 +++++++++-
 builtin/for-each-ref.c             |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index e9f6a8a..74f24f4 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 [verse]
 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
 		   [(--sort=<key>)...] [--format=<format>] [<pattern>...]
-		   [--points-at <object>]
+		   [--points-at <object>] [(--merged | --no-merged) <object>]
 
 DESCRIPTION
 -----------
@@ -66,6 +66,14 @@ OPTIONS
 --points-at <object>::
 	Only list tags of the given object.
 
+--merged [<commit>]::
+	Only list refs whose tips are reachable from the
+	specified commit (HEAD if not specified).
+
+--no-merged [<commit>]::
+	Only list refs whose tips are not reachable from the
+	specified commit (HEAD if not specified).
+
 FIELD NAMES
 -----------
 
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index b9d180a..82605ed 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -8,6 +8,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>]"),
 	NULL
 };
 
@@ -38,6 +39,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 		OPT_CALLBACK(0, "points-at", &ref_cbdata.filter.points_at,
 			     N_("object"), N_("print only tags of the object"),
 			     parse_opt_points_at),
+		OPT_MERGED(&ref_cbdata.filter, N_("print only merged refs")),
+		OPT_NO_MERGED(&ref_cbdata.filter, N_("print only not merged refs")),
 		OPT_END(),
 	};
 
-- 
2.4.2

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

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-06 20:03 [RFC/PATCH 0/9] add options to ref-filter Karthik Nayak
2015-06-06 20:04 ` [RFC/PATCH 1/9] tag: libify parse_opt_points_at() Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 2/9] ref-filter: implement '--points-at' option Karthik Nayak
2015-06-08 17:31     ` Matthieu Moy
2015-06-08 18:50       ` Karthik Nayak
2015-06-08 18:00     ` Matthieu Moy
2015-06-08 18:54       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 3/9] for-each-ref: add " Karthik Nayak
2015-06-08 17:35     ` Matthieu Moy
2015-06-08 18:51       ` Karthik Nayak
2015-06-08 19:12     ` Junio C Hamano
2015-06-09 12:01       ` Karthik Nayak
2015-06-09 19:07         ` Junio C Hamano
2015-06-10  6:55           ` Karthik Nayak
2015-06-10  7:39           ` Matthieu Moy
2015-06-10 11:31             ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 4/9] parse-options: add parse_opt_merge_filter() Karthik Nayak
2015-06-08 17:58     ` Matthieu Moy
2015-06-08 18:54       ` Karthik Nayak
2015-06-08 19:20     ` Junio C Hamano
2015-06-09 12:36       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 5/9] ref-filter: implement '--merged' and '--no-merged' options Karthik Nayak
2015-06-08 17:51     ` Matthieu Moy
2015-06-08 18:53       ` Karthik Nayak
2015-06-06 20:04   ` Karthik Nayak [this message]
2015-06-08 17:53     ` [RFC/PATCH 6/9] for-each-ref: add " Matthieu Moy
2015-06-08 18:54       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 7/9] parse-options.h: add macros for '--contains' option Karthik Nayak
2015-06-08 19:32     ` Junio C Hamano
2015-06-09 12:49       ` Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 8/9] ref-filter: add " Karthik Nayak
2015-06-06 20:04   ` [RFC/PATCH 9/9] for-each-ref: " Karthik Nayak
2015-06-08 19:00   ` [RFC/PATCH 1/9] tag: libify parse_opt_points_at() Junio C Hamano
2015-06-09 11:50     ` Karthik Nayak
2015-06-07 13:10 ` [RFC/PATCH 0/9] add options to ref-filter Christian Couder
2015-06-08 15:00   ` Karthik Nayak
2015-06-08 19:34 ` 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

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

  git send-email \
    --in-reply-to=1433621052-5588-6-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).