diff options
Diffstat (limited to 'rerere.c')
| -rw-r--r-- | rerere.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,10 @@ #include "cache.h" +#include "abspath.h" +#include "alloc.h" #include "config.h" +#include "copy.h" +#include "gettext.h" +#include "hex.h" #include "lockfile.h" #include "string-list.h" #include "rerere.h" @@ -9,9 +14,11 @@ #include "ll-merge.h" #include "attr.h" #include "pathspec.h" +#include "object-file.h" #include "object-store.h" #include "hash-lookup.h" #include "strmap.h" +#include "wrapper.h" #define RESOLVED 0 #define PUNTED 1 @@ -965,8 +972,9 @@ static int handle_cache(struct index_state *istate, break; i = ce_stage(ce) - 1; if (!mmfile[i].ptr) { - mmfile[i].ptr = read_object_file(&ce->oid, &type, - &size); + mmfile[i].ptr = repo_read_object_file(the_repository, + &ce->oid, &type, + &size); mmfile[i].size = size; } } |