Merge branch 'rs/remote-curl-use-argv-array'

[thirdparty/git.git] / builtin / describe.c

diff --git a/builtin/describe.c b/builtin/describe.c
index 8cf2cd992d3b2367b73ed22eb9a6d6fd6a347dce..b6df81d8d0e80e9665ae8f8afcf3cb03d1ae688c 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -15,7 +15,6 @@
 #include "argv-array.h"
 #include "run-command.h"
 #include "object-store.h"
-#include "revision.h"
 #include "list-objects.h"
 #include "commit-slab.h"
 
@@ -316,7 +315,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
                 */
                append_name(n, dst);
                if (longformat)
-                       append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst);
+                       append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst);
                if (suffix)
                        strbuf_addstr(dst, suffix);
                return;
@@ -333,7 +332,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
                struct commit_name *n;
 
                init_commit_names(&commit_names);
-               hashmap_for_each_entry(&names, &iter, n, struct commit_name,
+               hashmap_for_each_entry(&names, &iter, n,
                                        entry /* member name */) {
                        c = lookup_commit_reference_gently(the_repository,
                                                           &n->peeled, 1);