summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-09-05 20:08:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-07 19:59:42 (GMT)
commitd449347d080cd97a9d6dc029014383d4817e34bf (patch)
treed64c39be3f1cd8f5833ac1a9dde0664de686a0bf /notes-merge.c
parente910bb1e79d53d43d07013b4d7e58c9f3ec53c8d (diff)
downloadgit-d449347d080cd97a9d6dc029014383d4817e34bf.zip
git-d449347d080cd97a9d6dc029014383d4817e34bf.tar.gz
git-d449347d080cd97a9d6dc029014383d4817e34bf.tar.bz2
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 'notes-merge.c')
-rw-r--r--notes-merge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/notes-merge.c b/notes-merge.c
index cb36b43..b353628 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -344,9 +344,9 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
mmfile_t base, local, remote;
int status;
- read_mmblob(&base, p->base.hash);
- read_mmblob(&local, p->local.hash);
- read_mmblob(&remote, p->remote.hash);
+ read_mmblob(&base, &p->base);
+ read_mmblob(&local, &p->local);
+ read_mmblob(&remote, &p->remote);
status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL,
&local, o->local_ref, &remote, o->remote_ref, NULL);