Merge branch 'maint'
* maint:
Fix list of released versions in the toc document
Do not fail "describe --always" in a tag-less repository
diff --git a/Documentation/git.txt b/Documentation/git.txt
index df46a34..10f2f82 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,7 +43,7 @@
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.6.5/git.html[documentation for release 1.6.5]
+* link:v1.6.5.1/git.html[documentation for release 1.6.5.1]
* release notes for
link:RelNotes-1.6.5.1.txt[1.6.5.1],
diff --git a/builtin-describe.c b/builtin-describe.c
index 2dcfd3d..eaa8a9d 100644
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -351,7 +351,7 @@
}
for_each_ref(get_name, NULL);
- if (!found_names)
+ if (!found_names && !always)
die("No names found, cannot describe anything.");
if (argc == 0) {
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 8c7e081..f5a1b61 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -34,6 +34,8 @@
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) &&
