Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
worktree: initialize return value for submodule_uses_worktrees
[gitweb.git]
/
rerere.c
diff --git
a/rerere.c
b/rerere.c
index aaadec17d867d521fc0eaab7fcdd2e871bdf1267..5d083ca572df0c8a2cb90c0b12c14e15b4134d48 100644
(file)
--- a/
rerere.c
+++ b/
rerere.c
@@
-980,7
+980,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->sha1, &type, &size);
+ mmfile[i].ptr = read_sha1_file(ce->oid.hash, &type,
+ &size);
mmfile[i].size = size;
}
}