Merge branch 'maint'

* maint:
  Fix list of released versions in the toc document
  Do not fail "describe --always" in a tag-less repository
This commit is contained in:
Junio C Hamano
2009-10-23 22:40:18 -07:00
3 changed files with 4 additions and 2 deletions

View File

@ -351,7 +351,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
}
for_each_ref(get_name, NULL);
if (!found_names)
if (!found_names && !always)
die("No names found, cannot describe anything.");
if (argc == 0) {