Merge branch 'bw/config-h'

diff --git a/list-objects.c b/list-objects.c
index 917cc5d7c9ee04d07199f18b78342b84c0375fcd..b3931fa434dc99a481569697585e3bb21190c932 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -110,16 +110,16 @@ static void process_tree(struct rev_info *revs,
 
                if (S_ISDIR(entry.mode))
                        process_tree(revs,
-                                    lookup_tree(entry.sha1),
+                                    lookup_tree(entry.oid),
                                     show, base, entry.path,
                                     cb_data);
                else if (S_ISGITLINK(entry.mode))
-                       process_gitlink(revs, entry.sha1,
+                       process_gitlink(revs, entry.oid->hash,
                                        show, base, entry.path,
                                        cb_data);
                else
                        process_blob(revs,
-                                    lookup_blob(entry.sha1),
+                                    lookup_blob(entry.oid),
                                     show, base, entry.path,
                                     cb_data);
        }