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

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index ad4286fbdde521c3eebc048577bc61a341c9e6ee..292a975ccfdaed6780d291e23fafae731e802d43 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2806,7 +2806,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
        }
        strvec_clear(&prune_data);
 
-       if (revs->def == NULL)
+       if (!revs->def)
                revs->def = opt ? opt->def : NULL;
        if (opt && opt->tweak)
                opt->tweak(revs, opt);
@@ -3625,7 +3625,7 @@ static enum rewrite_result rewrite_one_1(struct rev_info *revs,
                        return rewrite_one_ok;
                if (!p->parents)
                        return rewrite_one_noparents;
-               if ((p = one_relevant_parent(revs, p->parents)) == NULL)
+               if (!(p = one_relevant_parent(revs, p->parents)))
                        return rewrite_one_ok;
                *pp = p;
        }