diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-24 09:40:18 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-24 09:40:18 +0400 |
| commit | 02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac (patch) | |
| tree | 7318eebef4426b895eb72d60893659404129d47a /t | |
| parent | 3694209ca16c033fb4c539cc23b0b370e48952dd (diff) | |
| parent | 2cf6b4bfec068cf24bdc3e4d46ad233091471a02 (diff) | |
Merge branch 'maint'
* maint:
Fix list of released versions in the toc document
Do not fail "describe --always" in a tag-less repository
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6120-describe.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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) && |