| commit | 7a0d61bb45055cacf85111e7c48dfb9054b0abb0 | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Wed, 18 Nov 2009 13:32:26 +0000 (18 14:32 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 21 Nov 2009 05:58:11 +0000 (20 21:58 -0800) | ||
| tree | f5e4e43aa276ace21b441fa27829ea0fe434787c | treesnapshot (tar.gz zip) |
| parent | 75b9a8a6d5aee29b1d0d03935531081e6180c0db | commitdiff |
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>
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>
| builtin-describe.c | diffblobblamehistory | |
| t/t6120-describe.sh | diffblobblamehistory |