X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore.h;h=1ea80671e30500f95fc1b648ccc6d5143ac0ac52;hb=c6ec3b13b81d59272e41d5316689c65dd4cc2e63;hp=73c7842cc7fd907519016b936a96b6f08cd80b47;hpb=0a8f4f0020cb35095005852c0797f0b90e9ebb74;p=git.git

diff --git a/diffcore.h b/diffcore.h
index 73c7842cc..1ea80671e 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -53,11 +53,12 @@ struct diff_filepair {
 	char status; /* M C R N D U (see Documentation/diff-format.txt) */
 	unsigned source_stays : 1; /* all of R/C are copies */
 	unsigned broken_pair : 1;
+	unsigned renamed_pair : 1;
+	unsigned is_unmerged : 1;
 };
-#define DIFF_PAIR_UNMERGED(p) \
-	(!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
+#define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)
 
-#define DIFF_PAIR_RENAME(p) (strcmp((p)->one->path, (p)->two->path))
+#define DIFF_PAIR_RENAME(p) ((p)->renamed_pair)
 
 #define DIFF_PAIR_BROKEN(p) \
 	( (!DIFF_FILE_VALID((p)->one) != !DIFF_FILE_VALID((p)->two)) && \