X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore.h;h=2249bc2c05744ce5026744547fcb30195a19b3f1;hb=fc61e313da0a124e9f6a213cd76944a8c4e6c918;hp=73c7842cc7fd907519016b936a96b6f08cd80b47;hpb=48d6e97afe4dcce3bb01922b768cc4d831923e7f;p=git.git diff --git a/diffcore.h b/diffcore.h index 73c7842cc..2249bc2c0 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; }; #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_RENAME(p) ((p)->renamed_pair) #define DIFF_PAIR_BROKEN(p) \ ( (!DIFF_FILE_VALID((p)->one) != !DIFF_FILE_VALID((p)->two)) && \