X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore.h;h=cc96c20734bf4184970f5381416637cf6e45ea13;hb=06f60e8edf1eb3a91e1af6f255bf46154168dd86;hp=30055ac5a9692f0f1f952de0754f36221cd07664;hpb=9fb88419ba85e641006c80db53620423f37f1c93;p=git.git

diff --git a/diffcore.h b/diffcore.h
index 30055ac5a..cc96c2073 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -31,6 +31,7 @@ struct diff_filespec {
 	unsigned long size;
 	int count;               /* Reference count */
 	int xfrm_flags;		 /* for use by the xfrm */
+	int rename_used;         /* Count of rename users */
 	unsigned short mode;	 /* file mode */
 	unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
 				  * if false, use the name and read from
@@ -58,7 +59,6 @@ struct diff_filepair {
 	struct diff_filespec *two;
 	unsigned short int score;
 	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;