From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Jun 2008 20:15:59 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60727b5800d7791e5b107620cb5b2d344cf97fe9?ds=inline;hp=-c

Merge branch 'maint'

* maint:
describe: match pattern for lightweight tags too
---

60727b5800d7791e5b107620cb5b2d344cf97fe9
diff --combined t/t6120-describe.sh
index ea476a2582,c6bfef5f47..c6be2597f7
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@@ -108,7 -108,7 +108,7 @@@ warning: tag 'A' is really 'Q' her
  EOF
  check_describe A-* HEAD
  test_expect_success 'warning was displayed for Q' '
 -	git diff err.expect err.actual
 +	test_cmp err.expect err.actual
  '
  test_expect_success 'rename tag Q back to A' '
  	mv .git/refs/tags/Q .git/refs/tags/A
@@@ -117,4 -117,26 +117,26 @@@
  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