X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=28046a998426e88dec9ad6ab431624bb41a81ce1;hb=1ea9f9d6c28caf886747ca256e9d39d24f03d229;hp=71c4d45fcd1ac49630bdb8bc7b0aec658011c21b;hpb=bf9b46c16d28c0e1f938947a98ca518f9644b0c0;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index 71c4d45fc..28046a998 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -359,7 +359,7 @@ static int ll_merge_in_worktree(struct notes_merge_options *o,
 	read_mmblob(&remote, p->remote);
 
 	status = ll_merge(&result_buf, sha1_to_hex(p->obj), &base, NULL,
-			  &local, o->local_ref, &remote, o->remote_ref, 0);
+			  &local, o->local_ref, &remote, o->remote_ref, NULL);
 
 	free(base.ptr);
 	free(local.ptr);
@@ -615,7 +615,7 @@ int notes_merge(struct notes_merge_options *o,
 	bases = get_merge_bases(local, remote, 1);
 	if (!bases) {
 		base_sha1 = null_sha1;
-		base_tree_sha1 = (unsigned char *)EMPTY_TREE_SHA1_BIN;
+		base_tree_sha1 = EMPTY_TREE_SHA1_BIN;
 		OUTPUT(o, 4, "No merge base found; doing history-less merge");
 	} else if (!bases->next) {
 		base_sha1 = bases->item->object.sha1;