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

Merge branch 'ep/maint-equals-null-cocci' for maint-2.35

Browse Source 
* ep/maint-equals-null-cocci:
  tree-wide: apply equals-null.cocci
  contrib/coccinnelle: add equals-null.cocci
This commit is contained in:
Junio C Hamano
2022-05-02 10:06:00 -07:00
parent d516b2db0a afe8a9070b
commit 2b0a58d164
64 changed files with 171 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-ort.c
View File

@ -2018,7 +2018,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
* to ensure that's the case.
*/
c_info = strmap_get(collisions, new_path);
if (c_info == NULL)
if (!c_info)
BUG("c_info is NULL");
/*
@ -4587,7 +4587,7 @@ static void merge_ort_internal(struct merge_options *opt,
}
merged_merge_bases = pop_commit(&merge_bases);
if (merged_merge_bases == NULL) {
if (!merged_merge_bases) {
/* if there is no common ancestor, use an empty tree */
struct tree *tree;