mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert read_mmblob to take struct object_id.

Browse Source 
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>
This commit is contained in:
brian m. carlson
2016-09-05 20:08:02 +00:00
committed by Junio C Hamano
parent e910bb1e79
commit d449347d08
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
notes-merge.c
View File

@ -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);