Merge branch 'jk/cocci'
spatch transformation to replace boolean uses of !hashcmp() to newly introduced oideq() is added, and applied, to regain performance lost due to support of multiple hash algorithms. * jk/cocci: show_dirstat: simplify same-content check read-cache: use oideq() in ce_compare functions convert hashmap comparison functions to oideq() convert "hashcmp() != 0" to "!hasheq()" convert "oidcmp() != 0" to "!oideq()" convert "hashcmp() == 0" to hasheq() convert "oidcmp() == 0" to oideq() introduce hasheq() and oideq() coccinelle: use <...> for function exclusion
This commit is contained in:
@ -342,7 +342,7 @@ static int show_modified(struct rev_info *revs,
|
||||
}
|
||||
|
||||
if (revs->combine_merges && !cached &&
|
||||
(oidcmp(oid, &old_entry->oid) || oidcmp(&old_entry->oid, &new_entry->oid))) {
|
||||
(!oideq(oid, &old_entry->oid) || !oideq(&old_entry->oid, &new_entry->oid))) {
|
||||
struct combine_diff_path *p;
|
||||
int pathlen = ce_namelen(new_entry);
|
||||
|
||||
@ -366,7 +366,7 @@ static int show_modified(struct rev_info *revs,
|
||||
}
|
||||
|
||||
oldmode = old_entry->ce_mode;
|
||||
if (mode == oldmode && !oidcmp(oid, &old_entry->oid) && !dirty_submodule &&
|
||||
if (mode == oldmode && oideq(oid, &old_entry->oid) && !dirty_submodule &&
|
||||
!revs->diffopt.flags.find_copies_harder)
|
||||
return 0;
|
||||
|
||||
|
Reference in New Issue
Block a user