Merge branch 'maint'
* maint: describe: match pattern for lightweight tags too
This commit is contained in:
commit
60727b5800
@ -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;
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user