diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:47:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:47:29 -0700 |
| commit | b19beecd9456a2e6282634e5df751206b972604a (patch) | |
| tree | 52617650de39f12bbeb351acf7fb5c9b5becf5cb /diff-lib.c | |
| parent | 474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9 (diff) | |
| parent | 1f1e895fccc52a1e227c464c4558d74604301a9f (diff) | |
| download | git-b19beecd9456a2e6282634e5df751206b972604a.tar.gz | |
Merge branch 'lt/objlist' into next
* lt/objlist:
Add "named object array" concept
xdiff: minor changes to match libxdiff-0.21
fix rfc2047 formatter.
Fix t8001-annotate and t8002-blame for ActiveState Perl
Add specialized object allocator
Diffstat (limited to 'diff-lib.c')
| -rw-r--r-- | diff-lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-lib.c b/diff-lib.c index fdc11732df..116b5a9d68 100644 --- 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); |