Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/pull-rebase-ff'
[gitweb.git]
/
cache-tree.c
diff --git
a/cache-tree.c
b/cache-tree.c
index f28b1f45a49b842c2f7a372b0c0c595bebc56b5d..345ea359638fbdfec874c55d387f9da2399338d2 100644
(file)
--- a/
cache-tree.c
+++ b/
cache-tree.c
@@
-168,7
+168,7
@@
static int verify_cache(struct cache_entry **cache,
break;
}
fprintf(stderr, "%s: unmerged (%s)\n",
- ce->name,
sha1_to_hex(ce->sha1
));
+ ce->name,
oid_to_hex(&ce->oid
));
}
}
if (funny)
@@
-349,7
+349,7
@@
static int update_one(struct cache_tree *it,
}
}
else {
- sha1 = ce->
sha1
;
+ sha1 = ce->
oid.hash
;
mode = ce->ce_mode;
entlen = pathlen - baselen;
i++;