diff options
| author | Karthik Nayak <karthik.188@gmail.com> | 2015-09-10 19:22:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-17 20:02:50 +0300 |
| commit | 5242860f548d1869ac2779726ad496f0ae8ab5ca (patch) | |
| tree | 34b29e239726d239c4afc4e82348b58c00eb4743 /t/t7004-tag.sh | |
| parent | df0947417acd1058c17e2bf20374497f33084549 (diff) | |
tag.c: implement '--merged' and '--no-merged' options
Use 'ref-filter' APIs to 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 <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/t7004-tag.sh')
| -rwxr-xr-x | t/t7004-tag.sh | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 8987fb160d..3dd2f51e49 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1531,4 +1531,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 |