[PATCH] diff: code clean-up and removal of rename hack.

[git.git] / diffcore.h

diff --git a/diffcore.h b/diffcore.h
index 60ee775..032902a 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -39,15 +39,15 @@ extern void diff_free_filespec_data(struct diff_filespec *);
 struct diff_filepair {
        struct diff_filespec *one;
        struct diff_filespec *two;
-       unsigned short int score; /* only valid when one and two are
-                                  * different paths
-                                  */
+       unsigned short int score;
        char source_stays; /* all of R/C are copies */
        char status; /* M C R N D U (see Documentation/diff-format.txt) */
 };
 #define DIFF_PAIR_UNMERGED(p) \
        (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
 
+#define DIFF_PAIR_RENAME(p) (strcmp((p)->one->path, (p)->two->path))
+
 #define DIFF_PAIR_TYPE_CHANGED(p) \
        ((S_IFMT & (p)->one->mode) != (S_IFMT & (p)->two->mode))