diff options
| author | Michael Dressel <MichaelTiloDressel@t-online.de> | 2008-06-04 21:06:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-04 13:08:03 -0700 |
| commit | 4ed19a3c178d22fbd424af78b42b65533a8d1ebb (patch) | |
| tree | a190332ce9ec7b4e6a614a6335a2cae255faa3e5 | |
| parent | 28bc30220f30850a10217d61f73e46d8a541e670 (diff) | |
| download | git-4ed19a3c178d22fbd424af78b42b65533a8d1ebb.tar.gz git-4ed19a3c178d22fbd424af78b42b65533a8d1ebb.tar.xz | |
describe: match pattern for lightweight tags too
The <pattern> 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 <MichaelTiloDressel@t-online.de>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-describe.c | 9 | ||||
| -rwxr-xr-x | t/t6120-describe.sh | 22 |
2 files changed, 27 insertions, 4 deletions
diff --git a/builtin-describe.c b/builtin-describe.c index df554b30a..3da99c1d0 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 56bbd8519..c6bfef5f4 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 |