diff options
| author |  Karthik Nayak <karthik.188@gmail.com> | 2015-07-07 21:36:13 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:25:28 -0700 |
| commit | 7c32834813bd6aee5ce5b2c4131d9f34249bc9e3 (patch) | |
| tree | b45207d72dd05e581a93ddf41df6ad4d7fc188a0 /t | |
| parent | ref-filter: implement '--merged' and '--no-merged' options (diff) | |
| download | tgif-7c32834813bd6aee5ce5b2c4131d9f34249bc9e3.tar.xz | |
for-each-ref: add '--merged' and '--no-merged' options
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6302-for-each-ref-filter.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh index 98ff4d5e43..0e68dcea65 100755 --- a/t/t6302-for-each-ref-filter.sh +++ b/t/t6302-for-each-ref-filter.sh @@ -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 |