diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-21 01:26:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-21 01:26:59 +0300 |
| commit | 538dc459a0331c48b893c9f6ca0be5917860bb99 (patch) | |
| tree | d8b7cf10c62573f767116c14f7ffd0d9e1d8ec32 /revision.c | |
| parent | acdeb10f91da939135fbacb847792ae237450d7d (diff) | |
| parent | 72a4ea71e5f29e4078363e87e4471128ff713a62 (diff) | |
Merge branch 'ep/maint-equals-null-cocci'
Introduce and apply coccinelle rule to discourage an explicit
comparison between a pointer and NULL, and applies the clean-up to
the maintenance track.
* ep/maint-equals-null-cocci:
tree-wide: apply equals-null.cocci
tree-wide: apply equals-null.cocci
contrib/coccinnelle: add equals-null.cocci
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.c b/revision.c index c367273c00..090a967bf4 100644 --- a/revision.c +++ b/revision.c @@ -2840,7 +2840,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); @@ -3659,7 +3659,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; } |