X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.h;h=0b76cc42816e1f7804df6f313f24ce9be491b6e8;hb=fcfda02bc7e3a9dacf63fa43df8eee530a471f96;hp=8f269b27721c3025a24c89bf16f32a6490397180;hpb=77eb2720460a3061ecdf3456d96a7093565fb4e9;p=git.git

diff --git a/diff.h b/diff.h
index 8f269b27..0b76cc42 100644
--- a/diff.h
+++ b/diff.h
@@ -20,15 +20,12 @@ extern void diff_unmerge(const char *path);
 /* These are for diff-tree-helper */
 
 struct diff_spec {
-	union {
-		const char *name;       /* path on the filesystem */
-		unsigned char sha1[20]; /* blob object ID */
-	} u;
+	unsigned char blob_sha1[20];
 	unsigned short mode;	 /* file mode */
-	unsigned sha1_valid : 1; /* if true, use u.sha1 and trust mode.
-				  * (however with a NULL SHA1, read them
-				  * from the file!).
-				  * if false, use u.name and read mode from
+	unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode;
+				  * however with a NULL SHA1, read them
+				  * from the file system.
+				  * if false, use the name and read mode from
 				  * the filesystem.
 				  */
 	unsigned file_valid : 1; /* if false the file does not even exist */