summaryrefslogtreecommitdiff
path: root/builtin-describe.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-23 11:42:39 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-23 12:00:41 -0700
commit024ab976fffdc1d78b6d0b15e261b52f3a5d594b (patch)
tree7b87632a6e5d242fe175396740aa210954ad1269 /builtin-describe.c
parent975457f185acd7c1f96ccff67cd5dc8dcb7908a0 (diff)
downloadgit-024ab976fffdc1d78b6d0b15e261b52f3a5d594b.tar.gz
Do not fail "describe --always" in a tag-less repository
This fixes a regression introduce by d68dc34 (git-describe: Die early if there are no possible descriptions, 2009-08-06). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-describe.c')
-rw-r--r--builtin-describe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-describe.c b/builtin-describe.c
index df67a733ae..7542b5705c 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -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;