diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-02 17:06:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-02 17:06:04 (GMT) |
| commit | 2b0a58d164b0642be3eeb476fecd28114445cdd5 (patch) | |
| tree | 2759549fcdd5d3ce4c9776f67937b4b75c07070f /merge-ort.c | |
| parent | d516b2db0af2221bd6b13e7347abdcb5830b2829 (diff) | |
| parent | afe8a9070bc62db9cfde1e30147178c40d391d93 (diff) | |
| download | git-2b0a58d164b0642be3eeb476fecd28114445cdd5.zip git-2b0a58d164b0642be3eeb476fecd28114445cdd5.tar.gz git-2b0a58d164b0642be3eeb476fecd28114445cdd5.tar.bz2 | |
Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
* ep/maint-equals-null-cocci:
tree-wide: apply equals-null.cocci
contrib/coccinnelle: add equals-null.cocci
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/merge-ort.c b/merge-ort.c index c319797..5f6f677 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -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; |