diffcore-rename: use is_empty_blob_oid
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0e72462fb4
commit
02491b67f3
@ -464,7 +464,7 @@ void diffcore_rename(struct diff_options *options)
|
||||
strcmp(options->single_follow, p->two->path))
|
||||
continue; /* not interested */
|
||||
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
|
||||
is_empty_blob_sha1(p->two->oid.hash))
|
||||
is_empty_blob_oid(&p->two->oid))
|
||||
continue;
|
||||
else if (add_rename_dst(p->two) < 0) {
|
||||
warning("skipping rename detection, detected"
|
||||
@ -474,7 +474,7 @@ void diffcore_rename(struct diff_options *options)
|
||||
}
|
||||
}
|
||||
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
|
||||
is_empty_blob_sha1(p->one->oid.hash))
|
||||
is_empty_blob_oid(&p->one->oid))
|
||||
continue;
|
||||
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user