X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff.c;h=a6590205e8f746304f3d06d3e328a05bf2bf954e;hb=8a8c55ea709d26ca397d6588e85579339885f507;hp=82afce782d88a1f773599332910982ef804aea12;hpb=460cccd3ba1d38fd64c9e83e40d58bcf3e9d7d2c;p=git.git

diff --git a/builtin-diff.c b/builtin-diff.c
index 82afce782..a6590205e 100644
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -68,9 +68,8 @@ static void stuff_change(struct diff_options *opt,
 {
 	struct diff_filespec *one, *two;
 
-	if (memcmp(null_sha1, old_sha1, 20) &&
-	    memcmp(null_sha1, new_sha1, 20) &&
-	    !memcmp(old_sha1, new_sha1, 20))
+	if (!is_null_sha1(old_sha1) && !is_null_sha1(new_sha1) &&
+	    !hashcmp(old_sha1, new_sha1))
 		return;
 
 	if (opt->reverse_diff) {
@@ -193,7 +192,7 @@ static int builtin_diff_combined(struct rev_info *revs,
 	parent = xmalloc(ents * sizeof(*parent));
 	/* Again, the revs are all reverse */
 	for (i = 0; i < ents; i++)
-		memcpy(parent + i, ent[ents - 1 - i].item->sha1, 20);
+		hashcpy((unsigned char*)parent + i, ent[ents - 1 - i].item->sha1);
 	diff_tree_combined(parent[0], parent + 1, ents - 1,
 			   revs->dense_combined_merges, revs);
 	return 0;
@@ -291,7 +290,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 		if (obj->type == OBJ_BLOB) {
 			if (2 <= blobs)
 				die("more than two blobs given: '%s'", name);
-			memcpy(blob[blobs].sha1, obj->sha1, 20);
+			hashcpy(blob[blobs].sha1, obj->sha1);
 			blob[blobs].name = name;
 			blobs++;
 			continue;