X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mktree.c;h=56205d1e0053cdcb7236bde199817a5529d3f433;hb=60c0f8462fefed22fc8fb9c4e529665ed8204536;hp=93241385e4aee76fc42db5849365740c474b9bdd;hpb=409d1d2053657f73a3222651111740606122aa80;p=git.git diff --git a/mktree.c b/mktree.c index 93241385e..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); } @@ -64,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);