mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more oideq/hasheq conversions

Browse Source 
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>
This commit is contained in:
Jeff King
2018-10-02 17:19:21 -04:00
committed by Junio C Hamano
parent fe8321ec05
commit e43d2dcce1
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/checkout.c
View File

@ -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;
/*