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 df46a3437197612a03d9d3f16c4fedf00af3cd16..10f2f82ca179c36bcb54ba938e92ba4858a127f6 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,7 +43,7 @@ unreleased) version of git, that is available from 'master'
 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 2dcfd3dfebdaad8fe87b8d09fa00b058f519ac5a..eaa8a9d229c97ebaab9ee3aa09d2456f68cd172c 100644 (file)
--- a/builtin-describe.c
+++ b/builtin-describe.c
@@ -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) {

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 8c7e081c53eec31d38844d8efb9b942893107b09..f5a1b615f65ecac2becff67d47842e7aed3d6091 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -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) &&