X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mktree.c;h=56205d1e0053cdcb7236bde199817a5529d3f433;hb=b8e9a00d40839a76928c54366a1c46ad54d7fd5d;hp=9a6f0d2f6b0be1307985b4bd56d0bc84abd1df02;hpb=182a8dabd5f5f646608f3857f10f3ac18c3d1445;p=git.git

diff --git a/mktree.c b/mktree.c
index 9a6f0d2f6..56205d1e0 100644
--- a/mktree.c
+++ b/mktree.c
@@ -30,7 +30,7 @@ static void append_to_tree(unsigned mode, unsigned char *sha1, char *path)
 	ent = entries[used++] = xmalloc(sizeof(**entries) + len + 1);
 	ent->mode = mode;
 	ent->len = len;
-	memcpy(ent->sha1, sha1, 20);
+	hashcpy(ent->sha1, sha1);
 	memcpy(ent->name, path, len+1);
 }
 
@@ -49,7 +49,6 @@ static void write_tree(unsigned char *sha1)
 	int i;
 
 	qsort(entries, used, sizeof(*entries), ent_compare);
-	size = 100;
 	for (size = i = 0; i < used; i++)
 		size += 32 + entries[i]->len;
 	buffer = xmalloc(size);
@@ -65,7 +64,7 @@ static void write_tree(unsigned char *sha1)
 		offset += sprintf(buffer + offset, "%o ", ent->mode);
 		offset += sprintf(buffer + offset, "%s", ent->name);
 		buffer[offset++] = 0;
-		memcpy(buffer + offset, ent->sha1, 20);
+		hashcpy((unsigned char*)buffer + offset, ent->sha1);
 		offset += 20;
 	}
 	write_sha1_file(buffer, offset, tree_type, sha1);