summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-09-05 20:08:02 +0000
committerJunio C Hamano <gitster@pobox.com>2016-09-07 12:59:42 -0700
commitd449347d080cd97a9d6dc029014383d4817e34bf (patch)
treed64c39be3f1cd8f5833ac1a9dde0664de686a0bf /merge-recursive.c
parente910bb1e79d53d43d07013b4d7e58c9f3ec53c8d (diff)
downloadgit-d449347d080cd97a9d6dc029014383d4817e34bf.tar.gz
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 'merge-recursive.c')
-rw-r--r--merge-recursive.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index e3db594da1..3750d2534f 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -910,9 +910,9 @@ static int merge_3way(struct merge_options *o,
name2 = mkpathdup("%s", branch2);
}
- read_mmblob(&orig, one->oid.hash);
- read_mmblob(&src1, a->oid.hash);
- read_mmblob(&src2, b->oid.hash);
+ read_mmblob(&orig, &one->oid);
+ read_mmblob(&src1, &a->oid);
+ read_mmblob(&src2, &b->oid);
merge_status = ll_merge(result_buf, a->path, &orig, base_name,
&src1, name1, &src2, name2, &ll_opts);