summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-04 20:15:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-06-04 20:15:59 (GMT)
commit60727b5800d7791e5b107620cb5b2d344cf97fe9 (patch)
treed9ebba045b5ce3c1359d9b84565a76320d858abb
parentde5825cc829a5d535de726eb7e5af45c0a3b88ce (diff)
parent4ed19a3c178d22fbd424af78b42b65533a8d1ebb (diff)
downloadgit-60727b5800d7791e5b107620cb5b2d344cf97fe9.zip
git-60727b5800d7791e5b107620cb5b2d344cf97fe9.tar.gz
git-60727b5800d7791e5b107620cb5b2d344cf97fe9.tar.bz2
Merge branch 'maint'
* maint: describe: match pattern for lightweight tags too
-rw-r--r--builtin-describe.c9
-rwxr-xr-xt/t6120-describe.sh22
2 files changed, 27 insertions, 4 deletions
diff --git a/builtin-describe.c b/builtin-describe.c
index df554b3..3da99c1 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -80,12 +80,13 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void
* Otherwise only annotated tags are used.
*/
if (might_be_tag) {
- if (is_tag) {
+ if (is_tag)
prio = 2;
- if (pattern && fnmatch(pattern, path + 10, 0))
- prio = 0;
- } else
+ else
prio = 1;
+
+ if (pattern && fnmatch(pattern, path + 10, 0))
+ prio = 0;
}
else
prio = 0;
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index ea476a2..c6be259 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