Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
dir: convert struct untracked_cache_dir to object_id
[gitweb.git]
/
rerere.c
diff --git
a/rerere.c
b/rerere.c
index ea24d4c2f47ab6495d97f38245dd420a1ad38391..18cae2d11c9a86aae0ed352a8f7606b142c5c183 100644
(file)
--- a/
rerere.c
+++ b/
rerere.c
@@
-979,8
+979,8
@@
static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
break;
i = ce_stage(ce) - 1;
if (!mmfile[i].ptr) {
- mmfile[i].ptr = read_
sha1_file(ce->oid.hash
, &type,
- &size);
+ mmfile[i].ptr = read_
object_file(&ce->oid
, &type,
+
&size);
mmfile[i].size = size;
}
}