Commit 024ab976 authored by Junio C Hamano's avatar Junio C Hamano

Do not fail "describe --always" in a tag-less repository

This fixes a regression introduce by d68dc34c (git-describe: Die early if
there are no possible descriptions, 2009-08-06).
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 975457f1
......@@ -197,7 +197,7 @@ static void describe(const char *arg, int last_one)
for_each_ref(get_name, NULL);
}
if (!found_names)
if (!found_names && !always)
die("cannot describe '%s'", sha1_to_hex(sha1));
n = cmit->util;
......
......@@ -34,6 +34,8 @@ test_expect_success setup '
echo one >file && git add file && git commit -m initial &&
one=$(git rev-parse HEAD) &&
git describe --always HEAD &&
test_tick &&
echo two >file && git add file && git commit -m second &&
two=$(git rev-parse HEAD) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment