Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t5319: expand test data
[gitweb.git]
/
rerere.c
diff --git
a/rerere.c
b/rerere.c
index 04d25691e4d6568d62e537f66d1651ba73a0a4fe..e0862e27786244b1a98723d09475223cc001dd62 100644
(file)
--- a/
rerere.c
+++ b/
rerere.c
@@
-978,8
+978,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;
}
}