merge-recur: Convert variable names to lower_case

[git.git] / diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index fdc11732dfbe201119182ff701f7fd40d74d1017..116b5a9d6834c9517ccc2202510b37a1e1d863a5 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -332,8 +332,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);