environment.h: move declarations for environment.c functions from cache.h

[thirdparty/git.git] / log-tree.c

diff --git a/log-tree.c b/log-tree.c
index 1dd5fcbf7be433740d83382db4c401d438a51720..e2bf8d6df75da73172c7e95c279b6b10da82aa74 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -2,6 +2,8 @@
 #include "commit-reach.h"
 #include "config.h"
 #include "diff.h"
+#include "environment.h"
+#include "hex.h"
 #include "object-store.h"
 #include "repository.h"
 #include "tmp-objdir.h"
@@ -12,6 +14,7 @@
 #include "merge-ort.h"
 #include "reflog-walk.h"
 #include "refs.h"
+#include "replace-object.h"
 #include "string-list.h"
 #include "color.h"
 #include "gpg-interface.h"
@@ -196,7 +199,8 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
        return 0;
 }
 
-static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
+static int add_graft_decoration(const struct commit_graft *graft,
+                               void *cb_data UNUSED)
 {
        struct commit *commit = lookup_commit(the_repository, &graft->oid);
        if (!commit)