mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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:
commit
02d56fab8b
|
@ -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],
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) &&
|
||||
|
|
Loading…
Reference in a new issue