[PATCH] describe: make '--always' fallback work after '--exact-match' failed
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- Aug 20, 2015, 12:13 UTC
- Message-ID
- <1440072823-18024-1-git-send-email-szeder@ira.uka.de>
'git describe [...] --always' should always show the unique abbreviated object name as a fallback when the given commit cannot be described with the given set of options, see da2478dbb0 (describe --always: fall back to showing an abbreviated object name, 2008-03-02).
However, this is not the case when the combination '--exact-match --always' is given and the commit cannot be described, because in such cases 'git describe' errors out, as if '--always' were not given at all.
Respect '--always' and print the unique abbreviated object name instead of erroring out when the commit cannot be described with '--exact-match --always'.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> --- builtin/describe.c | 2 +- t/t6120-describe.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/describe.c b/builtin/describe.c index a36c829e57..ce36032b1f 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -266,7 +266,7 @@ static void describe(const char *arg, int last_one) return; } - if (!max_candidates) + if (!always && !max_candidates) die(_("no tag exactly matches '%s'"), sha1_to_hex(cmit->object.sha1)); if (debug) fprintf(stderr, _("searching to describe %s\n"), arg); diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index c0e5b2a627..57d50156bb 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -113,6 +113,8 @@ check_describe A-3-* --long HEAD^^2 check_describe c-7-* --tags check_describe e-3-* --first-parent --tags +check_describe $(git rev-parse --short HEAD) --exact-match --always HEAD + : >err.expect check_describe A --all A^0 test_expect_success 'no warning was displayed for A' '
-- 2.5.0.343.g6f38143