diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2009-11-18 14:32:26 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-11-20 21:58:11 -0800 |
| commit | 7a0d61bb45055cacf85111e7c48dfb9054b0abb0 (patch) | |
| tree | f5e4e43aa276ace21b441fa27829ea0fe434787c | |
| parent | submodule.c: Squelch a "use before assignment" warning (diff) | |
| download | tgif-7a0d61bb45055cacf85111e7c48dfb9054b0abb0.tar.xz | |
describe: do not use unannotated tag even if exact match
4d23660 (describe: when failing, tell the user about options that
work, 2009-10-28) forgot to update the shortcut path where the code
detected and used a possible exact match. This means that an
unannotated tag on HEAD would be used by 'git describe'.
Guard this code path against the new circumstances, where unannotated
tags can be present in ->util even if we're not actually planning to
use them.
While there, also add some tests for --all.
Reported by 'yashi' on IRC.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-describe.c | 2 | ||||
| -rwxr-xr-x | t/t6120-describe.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/builtin-describe.c b/builtin-describe.c index d4efb10ddf..71be2a9364 100644 --- a/builtin-describe.c +++ b/builtin-describe.c @@ -200,7 +200,7 @@ static void describe(const char *arg, int last_one) die("%s is not a valid '%s' object", arg, commit_type); n = cmit->util; - if (n) { + if (n && (tags || all || n->prio == 2)) { /* * Exact match to an existing ref. */ diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index c050f94bc6..065deadc29 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -92,12 +92,18 @@ check_describe A-* HEAD^ check_describe D-* HEAD^^ check_describe A-* HEAD^^2 check_describe B HEAD^^2^ +check_describe D-* HEAD^^^ check_describe c-* --tags HEAD check_describe c-* --tags HEAD^ check_describe e-* --tags HEAD^^ check_describe c-* --tags HEAD^^2 check_describe B --tags HEAD^^2^ +check_describe e --tags HEAD^^^ + +check_describe heads/master --all HEAD +check_describe tags/c-* --all HEAD^ +check_describe tags/e --all HEAD^^^ check_describe B-0-* --long HEAD^^2^ check_describe A-3-* --long HEAD^^2 |