OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ld/p4-compare-dir-vs-symlink' into maint
[git-core/git.git]
/
cache-tree.c
diff --git
a/cache-tree.c
b/cache-tree.c
index
f28b1f4
..
345ea35
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++;