X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=e1aaf43b438d0cfb6b7b0c723060a662a915bcea;hb=f5114a40c0d0276ce6ff215a3dc51eb19da5b420;hp=28046a998426e88dec9ad6ab431624bb41a81ce1;hpb=2d11f21c365821ccba1e093f22b99ad71b955f21;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index 28046a998..e1aaf43b4 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -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",