hashcpy/hashcmp remaining bits.

This fixes up merge-recursive.c for hashcpy/hashcmp changes.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/merge-recursive.c b/merge-recursive.c
index 8a2f69731e88198f7669343e7c96853fc24428f9..39a1eae894398cd235a1dfb643c523823670f656 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -56,7 +56,7 @@ static int sha_eq(const unsigned char *a, const unsigned char *b)
 {
        if (!a && !b)
                return 2;
 {
        if (!a && !b)
                return 2;

-       return a && b && memcmp(a, b, 20) == 0;
+       return a && b && hashcmp(a, b) == 0;

 }
 
 /*
 }
 
 /*


@@ -891,11 +891,9 @@ static int process_renames(struct path_list *a_renames,
 
                        remove_file(1, ren1_src);
 
 
                        remove_file(1, ren1_src);
 

-                       memcpy(src_other.sha1,
-                                       ren1->src_entry->stages[stage].sha, 20);
+                       hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);

                        src_other.mode = ren1->src_entry->stages[stage].mode;
                        src_other.mode = ren1->src_entry->stages[stage].mode;

-                       memcpy(dst_other.sha1,
-                                       ren1->dst_entry->stages[stage].sha, 20);
+                       hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);

                        dst_other.mode = ren1->dst_entry->stages[stage].mode;
 
                        try_merge = 0;
                        dst_other.mode = ren1->dst_entry->stages[stage].mode;
 
                        try_merge = 0;


@@ -980,7 +978,7 @@ static int process_renames(struct path_list *a_renames,
 
 static unsigned char *has_sha(const unsigned char *sha)
 {
 
 static unsigned char *has_sha(const unsigned char *sha)
 {

-       return memcmp(sha, null_sha1, 20) == 0 ? NULL: (unsigned char *)sha;
+       return is_null_sha1(sha) ? NULL: (unsigned char *)sha;

 }
 
 /* Per entry merge function */
 }
 
 /* Per entry merge function */