mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lt/objlist' into next

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2006-06-19 18:47:29 -07:00
parent 474bc4e274 1f1e895fcc
commit b19beecd94
24 changed files with 241 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
diff-lib.c
View File

@ -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);