Merge branch 'jv/merge-nothing-into-void'

diff --git a/diff-lib.c b/diff-lib.c
index 241a8435eb1f7ddb88664343a5d9c42a1951886f..bc49c708c1854a0f67c25e4fd2b77a9ad50ff511 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -493,7 +493,7 @@ int run_diff_index(struct rev_info *revs, int cached)
        struct object_array_entry *ent;
 
        ent = revs->pending.objects;
-       if (diff_cache(revs, ent->item->sha1, ent->name, cached))
+       if (diff_cache(revs, ent->item->oid.hash, ent->name, cached))
                exit(128);
 
        diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");