Merge branch 'pb/config'

diff --git a/diff-lib.c b/diff-lib.c
index 2183b41b03d08092ba6d98a642757640b86710d6..d93cd55510d702ae6c5104ae9f896264ddc98f80 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -329,8 +329,8 @@ int run_diff_index(struct rev_info *revs, int cached)
        }
        mark_merge_entries();
 
-       ent = revs->pending_objects->item;
-       tree_name = revs->pending_objects->name;
+       ent = revs->pending.objects[0].item;
+       tree_name = revs->pending.objects[0].name;
        tree = parse_tree_indirect(ent->sha1);
        if (!tree)
                return error("bad tree object %s", tree_name);