diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-16 07:16:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-16 07:16:08 (GMT) |
| commit | ee56992a8792cd5e67029e71f3c75d7ce662ae6d (patch) | |
| tree | c98f7be58ae6d56b274225d24732697d15c318ac /builtin | |
| parent | 20f28d7cbd6d8599968ac41664c7300945234d7c (diff) | |
| parent | e43d2dcce1db256e95b90f89e06d62834a1d361c (diff) | |
| download | git-ee56992a8792cd5e67029e71f3c75d7ce662ae6d.zip git-ee56992a8792cd5e67029e71f3c75d7ce662ae6d.tar.gz git-ee56992a8792cd5e67029e71f3c75d7ce662ae6d.tar.bz2 | |
Merge branch 'jk/oideq-hasheq-cleanup'
Code clean-up.
* jk/oideq-hasheq-cleanup:
more oideq/hasheq conversions
Diffstat (limited to 'builtin')
| -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 b30b487..902c067 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; /* |