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 /builtin-describe.c | |
| parent | 3694209ca16c033fb4c539cc23b0b370e48952dd (diff) | |
| parent | 2cf6b4bfec068cf24bdc3e4d46ad233091471a02 (diff) | |
| download | git-02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac.tar.gz git-02d56fab8b8c2e5137d12cbad0a7bd12c3d683ac.tar.xz | |
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 'builtin-describe.c')
| -rw-r--r-- | builtin-describe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-describe.c b/builtin-describe.c index 2dcfd3dfe..eaa8a9d22 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) { |