mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-11 09:17:05 +02:00
Code

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:
Junio C Hamano 2009-10-23 22:40:18 -07:00
parent 3694209ca1 2cf6b4bfec
commit 02d56fab8b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git.txt
View File

@ -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],

2
builtin-describe.c
View File

@ -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) {

2
t/t6120-describe.sh
View File

@ -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) &&