diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2016-09-05 20:08:02 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-09-07 12:59:42 -0700 |
| commit | d449347d080cd97a9d6dc029014383d4817e34bf (patch) | |
| tree | d64c39be3f1cd8f5833ac1a9dde0664de686a0bf /builtin | |
| parent | notes-merge: convert struct notes_merge_pair to struct object_id (diff) | |
| download | tgif-d449347d080cd97a9d6dc029014383d4817e34bf.tar.xz | |
Convert read_mmblob to take struct object_id.
Since all of its callers have been updated, convert read_mmblob to take
a pointer to struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 6 | ||||
| -rw-r--r-- | builtin/checkout.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 76b1612178..df2c95d3f6 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3435,9 +3435,9 @@ static int three_way_merge(struct image *image, mmbuffer_t result = { NULL }; int status; - read_mmblob(&base_file, base->hash); - read_mmblob(&our_file, ours->hash); - read_mmblob(&their_file, theirs->hash); + read_mmblob(&base_file, base); + read_mmblob(&our_file, ours); + read_mmblob(&their_file, theirs); status = ll_merge(&result, path, &base_file, "base", &our_file, "ours", diff --git a/builtin/checkout.c b/builtin/checkout.c index ec85af565a..13169221b1 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -195,9 +195,9 @@ static int checkout_merged(int pos, 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].hash); - read_mmblob(&ours, threeway[1].hash); - read_mmblob(&theirs, threeway[2].hash); + read_mmblob(&ancestor, &threeway[0]); + read_mmblob(&ours, &threeway[1]); + read_mmblob(&theirs, &threeway[2]); /* * NEEDSWORK: re-create conflicts from merges with |