X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree-helper.c;h=a68328321aac9585d59fa8f4f939fccbcdb6c638;hb=92747a907cba83938def6e7eb3ee1b4d3d9e609f;hp=621f90ad0919f83a2484d72b9bccdc1ccf564b2b;hpb=a6f3f3b1088a2515255f3fb5a8302d9c9071193b;p=git.git

diff --git a/diff-tree-helper.c b/diff-tree-helper.c
index 621f90ad..a6832832 100644
--- a/diff-tree-helper.c
+++ b/diff-tree-helper.c
@@ -35,7 +35,7 @@ static int parse_oneside_change(const char *cp, struct diff_spec *one,
 	if (strncmp(cp, "\tblob\t", 6))
 		return -1;
 	cp += 6;
-	if (get_sha1_hex(cp, one->u.sha1))
+	if (get_sha1_hex(cp, one->blob_sha1))
 		return -1;
 	cp += 40;
 	if (*cp++ != '\t')
@@ -83,13 +83,13 @@ static int parse_diff_tree_output(const char *buf,
 		if (strncmp(cp, "\tblob\t", 6))
 			return -1;
 		cp += 6;
-		if (get_sha1_hex(cp, old.u.sha1))
+		if (get_sha1_hex(cp, old.blob_sha1))
 			return -1;
 		cp += 40;
 		if (strncmp(cp, "->", 2))
 			return -1;
 		cp += 2;
-		if (get_sha1_hex(cp, new.u.sha1))
+		if (get_sha1_hex(cp, new.blob_sha1))
 			return -1;
 		cp += 40;
 		if (*cp++ != '\t')