diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-04 13:15:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-04 13:15:59 -0700 |
| commit | 60727b5800d7791e5b107620cb5b2d344cf97fe9 (patch) | |
| tree | d9ebba045b5ce3c1359d9b84565a76320d858abb /t/t6120-describe.sh | |
| parent | de5825cc829a5d535de726eb7e5af45c0a3b88ce (diff) | |
| parent | 4ed19a3c178d22fbd424af78b42b65533a8d1ebb (diff) | |
| download | git-60727b5800d7791e5b107620cb5b2d344cf97fe9.tar.gz git-60727b5800d7791e5b107620cb5b2d344cf97fe9.tar.xz | |
Merge branch 'maint'
* maint:
describe: match pattern for lightweight tags too
Diffstat (limited to 't/t6120-describe.sh')
| -rwxr-xr-x | t/t6120-describe.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index ea476a258..c6be2597f 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -117,4 +117,26 @@ test_expect_success 'rename tag Q back to A' ' test_expect_success 'pack tag refs' 'git pack-refs' check_describe A-* HEAD +test_expect_success 'set-up matching pattern tests' ' + git tag -a -m test-annotated test-annotated && + echo >>file && + test_tick && + git commit -a -m "one more" && + git tag test1-lightweight && + echo >>file && + test_tick && + git commit -a -m "yet another" && + git tag test2-lightweight && + echo >>file && + test_tick && + git commit -a -m "even more" + +' + +check_describe "test-annotated-*" --match="test-*" + +check_describe "test1-lightweight-*" --tags --match="test1-*" + +check_describe "test2-lightweight-*" --tags --match="test2-*" + test_done |