From 01c4e70f637c0617e24d9a7abb7239e25de9a51d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 29 May 2005 16:56:48 -0700 Subject: [PATCH] diff: code clean-up and removal of rename hack. A new macro, DIFF_PAIR_RENAME(), is introduced to distinguish a filepair that is a rename/copy (the definition of which is src and dst are different paths, of course). This removes the hack used in the record_rename_pair() to always put a non-zero value in the score field. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diffcore.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'diffcore.h') diff --git a/diffcore.h b/diffcore.h index 60ee7756e3..032902ac72 100644 --- 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)) -- cgit v1.2.1