X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-stages.c;h=70bb89808d2296246edbafb8378aa651c3382261;hb=c6d499a82fbb02e2a03fe3d858ff144fa570fb34;hp=5960e089975f1f27c55c5bd8ea1c968ffe695d1f;hpb=67e31d6234c0332334d7aedd70b2f101bc010cf9;p=git.git diff --git a/builtin-diff-stages.c b/builtin-diff-stages.c index 5960e0899..70bb89808 100644 --- a/builtin-diff-stages.c +++ b/builtin-diff-stages.c @@ -46,7 +46,7 @@ static void diff_stages(int stage1, int stage2, const char **pathspec) else if (!two) diff_addremove(&diff_options, '-', ntohl(one->ce_mode), one->sha1, name, NULL); - else if (memcmp(one->sha1, two->sha1, 20) || + else if (hashcmp(one->sha1, two->sha1) || (one->ce_mode != two->ce_mode) || diff_options.find_copies_harder) diff_change(&diff_options,