Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: avoid triggering add_cacheinfo error with dirty mod
[gitweb.git]
/
dir.c
diff --git
a/dir.c
b/dir.c
index dedbf5d476f207e39c1b7853ec8c97553181e5fb..63a917be45db99c278cc86012ff74718043dc63d 100644
(file)
--- a/
dir.c
+++ b/
dir.c
@@
-243,7
+243,7
@@
static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat,
*size_out = 0;
*data_out = NULL;
- data = read_
sha1_file(oid->hash
, &type, &sz);
+ data = read_
object_file(oid
, &type, &sz);
if (!data || type != OBJ_BLOB) {
free(data);
return -1;