]> git.ipfire.org Git - thirdparty/git.git/commitdiff
blame.c: replace instance of !oidcmp for oideq
authorEdmundo Carmona Antoranz <eantoranz@gmail.com>
Tue, 8 Sep 2020 21:10:53 +0000 (15:10 -0600)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Sep 2020 22:57:26 +0000 (15:57 -0700)
0906ac2b (blame: use changed-path Bloom filters, 2020-04-16)
introduced a call to oidcmp() that should have been oideq(), which
was introduced in 14438c44 (introduce hasheq() and oideq(),
2018-08-28).

Signed-off-by: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
blame.c

diff --git a/blame.c b/blame.c
index da7e28800e7eb8c13b1200ed6207d2fe077ae66f..a8abe86ae4c5b19a3742308ab11f7f2fc57197aa 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -1352,8 +1352,8 @@ static struct blame_origin *find_origin(struct repository *r,
        else {
                int compute_diff = 1;
                if (origin->commit->parents &&
        else {
                int compute_diff = 1;
                if (origin->commit->parents &&
-                   !oidcmp(&parent->object.oid,
-                           &origin->commit->parents->item->object.oid))
+                   oideq(&parent->object.oid,
+                         &origin->commit->parents->item->object.oid))
                        compute_diff = maybe_changed_path(r, origin, bd);
 
                if (compute_diff)
                        compute_diff = maybe_changed_path(r, origin, bd);
 
                if (compute_diff)