X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=resolve-undo.c;h=0f50ee0484776c545e632cde69b0646629a3b190;hb=d32fad2b89c81ca29128722e0e2f5985426e5e7a;hp=37d73cd949bd884397615d0f6399bd64a88e20a1;hpb=77b3b7969d1a817e28639dc75305a9e301f0d4b4;p=git.git

diff --git a/resolve-undo.c b/resolve-undo.c
index 37d73cd94..0f50ee048 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -53,7 +53,7 @@ void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
 	for_each_string_list(write_one, resolve_undo, sb);
 }
 
-struct string_list *resolve_undo_read(void *data, unsigned long size)
+struct string_list *resolve_undo_read(const char *data, unsigned long size)
 {
 	struct string_list *resolve_undo;
 	size_t len;
@@ -93,7 +93,7 @@ struct string_list *resolve_undo_read(void *data, unsigned long size)
 				continue;
 			if (size < 20)
 				goto error;
-			hashcpy(ui->sha1[i], data);
+			hashcpy(ui->sha1[i], (const unsigned char *)data);
 			size -= 20;
 			data += 20;
 		}