Merge branch 'ab/sha1dc-build'

diff --git a/builtin/describe.c b/builtin/describe.c
index 21e37f5daea600fb9c7c9225a7ef63d83aa56f9e..c4289847063ac02ed061f890ffd71cd329d67109 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -274,10 +274,13 @@ static void append_name(struct commit_name *n, struct strbuf *dst)
                n->name_checked = 1;
        }
 
-       if (n->tag)
+       if (n->tag) {
+               if (all)
+                       strbuf_addstr(dst, "tags/");
                strbuf_addstr(dst, n->tag->tag);
-       else
+       } else {
                strbuf_addstr(dst, n->path);
+       }
 }
 
 static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst)