X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=e1aaf43b438d0cfb6b7b0c723060a662a915bcea;hb=bc50897b90177f03c74e53467d1b62aec74789c5;hp=1467ad31795ae21896f1e608e7cb032df2bc94a8;hpb=bac9c06ba093d9254cb2ab3eed074722a3e635a6;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index 1467ad317..e1aaf43b4 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);
@@ -707,7 +707,7 @@ int notes_merge_commit(struct notes_merge_options *o,
 		/* write file as blob, and add to partial_tree */
 		if (stat(ent->name, &st))
 			die_errno("Failed to stat '%s'", ent->name);
-		if (index_path(blob_sha1, ent->name, &st, 1))
+		if (index_path(blob_sha1, ent->name, &st, HASH_WRITE_OBJECT))
 			die("Failed to write blob object from '%s'", ent->name);
 		if (add_note(partial_tree, obj_sha1, blob_sha1, NULL))
 			die("Failed to add resolved note '%s' to notes tree",