Merge branch 'eb/hash-transition'

[thirdparty/git.git] / builtin / ls-tree.c

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 71281ab705b67048820fb93b8e1aa5a31cf6d7c5..61a2965c8a74c6f938eb01b507541056c408cad7 100644 (file)
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -9,9 +9,7 @@
 #include "hex.h"
 #include "object-name.h"
 #include "object-store-ll.h"
-#include "blob.h"
 #include "tree.h"
-#include "commit.h"
 #include "path.h"
 #include "quote.h"
 #include "parse-options.h"
@@ -241,7 +239,8 @@ static int show_tree_long(const struct object_id *oid, struct strbuf *base,
        return recurse;
 }
 
-static int show_tree_name_only(const struct object_id *oid, struct strbuf *base,
+static int show_tree_name_only(const struct object_id *oid UNUSED,
+                              struct strbuf *base,
                               const char *pathname, unsigned mode,
                               void *context)
 {