am: improve author-script error reporting

diff --git a/builtin/checkout.c b/builtin/checkout.c
index b30b48767e54a93f18ef0d341a04f14cc390e9a9..902c06702c62258384692f94ed6b55ecf6381a4e 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -497,7 +497,8 @@ static int skip_merge_working_tree(const struct checkout_opts *opts,
         * We must do the merge if we are actually moving to a new commit.
         */
        if (!old_branch_info->commit || !new_branch_info->commit ||
-               oidcmp(&old_branch_info->commit->object.oid, &new_branch_info->commit->object.oid))
+               !oideq(&old_branch_info->commit->object.oid,
+                      &new_branch_info->commit->object.oid))
                return 0;
 
        /*