Skip to content

Commit

Permalink
for-each-ref: add '--merged' and '--no-merged' options
Browse files Browse the repository at this point in the history
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 and tests 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Karthik Nayak authored and Junio C Hamano committed Aug 3, 2015
1 parent 35257aa commit 7c32834
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
10 changes: 9 additions & 1 deletion Documentation/git-for-each-ref.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----------
Expand Down Expand Up @@ -66,6 +66,14 @@ OPTIONS
--points-at <object>::
Only list refs which points at the given object.

--merged [<object>]::
Only list refs whose tips are reachable from the
specified commit (HEAD if not specified).

--no-merged [<object>]::
Only list refs whose tips are not reachable from the
specified commit (HEAD if not specified).

FIELD NAMES
-----------

Expand Down
3 changes: 3 additions & 0 deletions builtin/for-each-ref.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down Expand Up @@ -38,6 +39,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
OPT_CALLBACK(0, "points-at", &filter.points_at,
N_("object"), N_("print only refs which points at the given object"),
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_END(),
};

Expand Down
23 changes: 23 additions & 0 deletions t/t6302-for-each-ref-filter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,27 @@ test_expect_success 'check signed tags with --points-at' '
test_cmp expect actual
'

test_expect_success 'filtering with --merged' '
cat >expect <<-\EOF &&
refs/heads/master
refs/odd/spot
refs/tags/one
refs/tags/three
refs/tags/two
EOF
git for-each-ref --format="%(refname)" --merged=master >actual &&
test_cmp expect actual
'

test_expect_success 'filtering with --no-merged' '
cat >expect <<-\EOF &&
refs/heads/side
refs/tags/double-tag
refs/tags/four
refs/tags/signed-tag
EOF
git for-each-ref --format="%(refname)" --no-merged=master >actual &&
test_cmp expect actual
'

test_done

0 comments on commit 7c32834

Please sign in to comment.