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

[thirdparty/git.git] / merge-ort.c

diff --git a/merge-ort.c b/merge-ort.c
index c319797021938a9df635c8db146ac6555331c7db..5f6f6776b6c4646f6eb1493e3a07e77d707701d7 100644 (file)
--- 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;