From afe8a9070bc62db9cfde1e30147178c40d391d93 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 2 May 2022 09:50:37 -0700 Subject: tree-wide: apply equals-null.cocci Signed-off-by: Junio C Hamano --- rerere.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rerere.c') diff --git a/rerere.c b/rerere.c index d83d58df4f..bcefd0c4bf 100644 --- a/rerere.c +++ b/rerere.c @@ -591,7 +591,7 @@ int rerere_remaining(struct repository *r, struct string_list *merge_rr) else if (conflict_type == RESOLVED) { struct string_list_item *it; it = string_list_lookup(merge_rr, (const char *)e->name); - if (it != NULL) { + if (it) { free_rerere_id(it); it->util = RERERE_RESOLVED; } -- cgit v1.2.3