X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=notes-merge.c;h=1467ad31795ae21896f1e608e7cb032df2bc94a8;hb=bcf3d1fd9ccc04350d793c077d3c112fb26f43f0;hp=71c4d45fcd1ac49630bdb8bc7b0aec658011c21b;hpb=6ae7a51a2e8efdb10c18d59693e647a73d98d9d3;p=git.git

diff --git a/notes-merge.c b/notes-merge.c
index 71c4d45fc..1467ad317 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -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;