summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-02 16:50:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-05-02 16:50:37 (GMT)
commitafe8a9070bc62db9cfde1e30147178c40d391d93 (patch)
treed237acac7915db89829db7da1d0405f2e595a68b /ll-merge.c
parent7a618493facb79639231f797e492fab51fac2ba4 (diff)
downloadgit-afe8a9070bc62db9cfde1e30147178c40d391d93.zip
git-afe8a9070bc62db9cfde1e30147178c40d391d93.tar.gz
git-afe8a9070bc62db9cfde1e30147178c40d391d93.tar.bz2
tree-wide: apply equals-null.cocci
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 2616575..d964b53 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -204,7 +204,7 @@ static int 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;