diff options
| author | Jeff King <peff@peff.net> | 2018-10-02 21:19:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-04 10:42:48 (GMT) |
| commit | e43d2dcce1db256e95b90f89e06d62834a1d361c (patch) | |
| tree | 72b717680d6b340c71a970c29e7996d0e5b1ec35 /builtin | |
| parent | fe8321ec057f9231c26c29b364721568e58040f7 (diff) | |
| download | git-e43d2dcce1db256e95b90f89e06d62834a1d361c.zip git-e43d2dcce1db256e95b90f89e06d62834a1d361c.tar.gz git-e43d2dcce1db256e95b90f89e06d62834a1d361c.tar.bz2 | |
more oideq/hasheq conversions
We added faster equality-comparison functions for hashes in
14438c4497 (introduce hasheq() and oideq(), 2018-08-28). A
few topics were in-flight at the time, and can now be
converted. This covers all spots found by "make coccicheck"
in master (the coccicheck results were tweaked by hand for
style).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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; /* |