Merge branch 'tb/void-check-attr'

diff --git a/builtin/pull.c b/builtin/pull.c
index 2514bfb9cd6b4288bcda5e1676e3d4e20f10f281..b2055d1dd6f180ec2383ee6f569045e5a55cb4b4 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -800,7 +800,7 @@ static int run_rebase(const struct object_id *curr_head,
        struct argv_array args = ARGV_ARRAY_INIT;
 
        if (!get_octopus_merge_base(&oct_merge_base, curr_head, merge_head, fork_point))
-               if (!is_null_oid(fork_point) && !oidcmp(&oct_merge_base, fork_point))
+               if (!is_null_oid(fork_point) && oideq(&oct_merge_base, fork_point))
                        fork_point = NULL;
 
        argv_array_push(&args, "rebase");
@@ -903,7 +903,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
                oidclr(&curr_head);
 
        if (!is_null_oid(&orig_head) && !is_null_oid(&curr_head) &&
-                       oidcmp(&orig_head, &curr_head)) {
+                       !oideq(&orig_head, &curr_head)) {
                /*
                 * The fetch involved updating the current branch.
                 *