X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-read-tree.c;h=740a8c7e66bc3f893a680f8e8f9ebfad42141508;hb=d2eafb76611670d7573f9409b0c727019fe50e18;hp=ec40d013c4d8508bfd10d75e2dab3090dea64a45;hpb=73f0a1577b92f9ce932b34a6b8657dcb377dc311;p=git.git

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index ec40d013..740a8c7e 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -38,7 +38,7 @@ static struct tree_entry_list df_conflict_list = {
 
 typedef int (*merge_fn_t)(struct cache_entry **src);
 
-static int entcmp(char *name1, int dir1, char *name2, int dir2)
+static int entcmp(const char *name1, int dir1, const char *name2, int dir2)
 {
 	int len1 = strlen(name1);
 	int len2 = strlen(name2);
@@ -66,7 +66,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len,
 	int src_size = len + 1;
 	do {
 		int i;
-		char *first;
+		const char *first;
 		int firstdir = 0;
 		int pathlen;
 		unsigned ce_size;