From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 24 Oct 2009 05:40:18 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc0~106
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac;p=git.git

Merge branch 'maint'

* maint:
  Fix list of released versions in the toc document
  Do not fail "describe --always" in a tag-less repository
---

02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac
diff --cc builtin-describe.c
index 2dcfd3dfe,7542b5705..eaa8a9d22
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@@ -350,10 -359,6 +350,10 @@@ int cmd_describe(int argc, const char *
  		return cmd_name_rev(i + argc, args, prefix);
  	}
  
 +	for_each_ref(get_name, NULL);
- 	if (!found_names)
++	if (!found_names && !always)
 +		die("No names found, cannot describe anything.");
 +
  	if (argc == 0) {
  		describe("HEAD", 1);
  	} else {