diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-23 22:40:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-23 22:40:18 -0700 |
| commit | 02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac (patch) | |
| tree | 7318eebef4426b895eb72d60893659404129d47a | |
| parent | 3694209ca16c033fb4c539cc23b0b370e48952dd (diff) | |
| parent | 2cf6b4bfec068cf24bdc3e4d46ad233091471a02 (diff) | |
| download | git-02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac.tar.gz | |
Merge branch 'maint'
* maint:
Fix list of released versions in the toc document
Do not fail "describe --always" in a tag-less repository
| -rw-r--r-- | Documentation/git.txt | 2 | ||||
| -rw-r--r-- | builtin-describe.c | 2 | ||||
| -rwxr-xr-x | t/t6120-describe.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index df46a34371..10f2f82ca1 100644 --- 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 2dcfd3dfeb..eaa8a9d229 100644 --- 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 8c7e081c53..f5a1b615f6 100755 --- 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) && |