From 4ed19a3c178d22fbd424af78b42b65533a8d1ebb Mon Sep 17 00:00:00 2001 From: Michael Dressel Date: Wed, 4 Jun 2008 21:06:31 +0200 Subject: describe: match pattern for lightweight tags too The given "git describe --match" was used only to filter tag objects, and not to filter lightweight tags. This fixes it. [jc: made the log to clarify this is a bugfix, not an enhancement, with additional test] Signed-off-by: Michael Dressel Acked-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- t/t6120-describe.sh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 't') diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 56bbd8519d..c6bfef5f47 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 -- cgit v1.2.1