diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-02 10:06:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-02 10:06:04 -0700 |
| commit | 2b0a58d164b0642be3eeb476fecd28114445cdd5 (patch) | |
| tree | 2759549fcdd5d3ce4c9776f67937b4b75c07070f /combine-diff.c | |
| parent | Git 2.35.3 (diff) | |
| parent | tree-wide: apply equals-null.cocci (diff) | |
| download | git-2b0a58d164b0642be3eeb476fecd28114445cdd5.tar.gz git-2b0a58d164b0642be3eeb476fecd28114445cdd5.zip | |
Merge branch 'ep/maint-equals-null-cocci' for maint-2.35
* ep/maint-equals-null-cocci:
tree-wide: apply equals-null.cocci
contrib/coccinnelle: add equals-null.cocci
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index d93782daeb..b724f02123 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -195,10 +195,10 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase, struct lline *baseend, *newend = NULL; int i, j, origbaselen = *lenbase; - if (newline == NULL) + if (!newline) return base; - if (base == NULL) { + if (!base) { *lenbase = lennew; return newline; } |