Make sure the empty tree exists when needed in merge-recursive.

diff --git a/patch-id.c b/patch-id.c
index 3b4c80f764bd11a740a7cce60f2e8c062706e897..086d2d9c68835c6a7434932f6e3b430e0906578d 100644 (file)
--- a/patch-id.c
+++ b/patch-id.c
@@ -47,7 +47,7 @@ static void generate_id_list(void)
 
                if (!get_sha1_hex(p, n)) {
                        flush_current_id(patchlen, sha1, &ctx);
-                       memcpy(sha1, n, 20);
+                       hashcpy(sha1, n);
                        patchlen = 0;
                        continue;
                }