diff options
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index b30b48767e..902c06702c 100644 --- 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; /* |