diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-20 15:26:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-20 15:26:59 -0700 |
| commit | 538dc459a0331c48b893c9f6ca0be5917860bb99 (patch) | |
| tree | d8b7cf10c62573f767116c14f7ffd0d9e1d8ec32 /ll-merge.c | |
| parent | acdeb10f91da939135fbacb847792ae237450d7d (diff) | |
| parent | 72a4ea71e5f29e4078363e87e4471128ff713a62 (diff) | |
| download | git-538dc459a0331c48b893c9f6ca0be5917860bb99.tar.gz | |
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 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c index a937cec59a..14b8362019 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -207,7 +207,7 @@ static enum ll_merge_result ll_ext_merge(const struct ll_merge_driver *fn, dict[4].placeholder = "P"; dict[4].value = path_sq.buf; dict[5].placeholder = NULL; dict[5].value = NULL; - if (fn->cmdline == NULL) + if (!fn->cmdline) die("custom merge driver %s lacks command line.", fn->name); result->ptr = NULL; |