diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-29 23:56:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-30 17:35:49 (GMT) |
| commit | 01c4e70f637c0617e24d9a7abb7239e25de9a51d (patch) | |
| tree | 0b519a6e1963b1b83e830593c41c14a6fe2547b9 /diffcore.h | |
| parent | befe86392c767b62e4a6498cf951faae6f2c5ea3 (diff) | |
| download | git-01c4e70f637c0617e24d9a7abb7239e25de9a51d.zip git-01c4e70f637c0617e24d9a7abb7239e25de9a51d.tar.gz git-01c4e70f637c0617e24d9a7abb7239e25de9a51d.tar.bz2 | |
[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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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)) |