Merge branch 'jk/sha1-file-reduce-useless-warnings'

diff --git a/log-tree.c b/log-tree.c
index 2c1ed0fa90170438e00a2eadbf74e15d89531613..cf4646b0f4d78dfb9229287859d48022afc21b65 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -137,7 +137,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
 
 static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
 {
-       struct commit *commit = lookup_commit(graft->sha1);
+       struct commit *commit = lookup_commit(graft->oid.hash);
        if (!commit)
                return 0;
        add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);