diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 6 | ||||
| -rw-r--r-- | builtin/merge-file.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 0ba4f03f2e..f7b313816e 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -294,9 +294,9 @@ static int checkout_merged(int pos, const struct checkout *state, if (is_null_oid(&threeway[1]) || is_null_oid(&threeway[2])) return error(_("path '%s' does not have necessary versions"), path); - read_mmblob(&ancestor, &threeway[0]); - read_mmblob(&ours, &threeway[1]); - read_mmblob(&theirs, &threeway[2]); + read_mmblob(&ancestor, the_repository->objects, &threeway[0]); + read_mmblob(&ours, the_repository->objects, &threeway[1]); + read_mmblob(&theirs, the_repository->objects, &threeway[2]); repo_config_get_bool(the_repository, "merge.renormalize", &renormalize); ll_opts.renormalize = renormalize; diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 46775d0c79..c5dbd028fd 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -128,7 +128,7 @@ int cmd_merge_file(int argc, ret = error(_("object '%s' does not exist"), argv[i]); else if (!oideq(&oid, the_hash_algo->empty_blob)) - read_mmblob(mmf, &oid); + read_mmblob(mmf, the_repository->objects, &oid); else read_mmfile(mmf, "/dev/null"); } else if (read_mmfile(mmf, fname)) { |