diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-05-02 19:50:37 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-05-02 19:50:37 +0300 |
commit | afe8a9070bc62db9cfde1e30147178c40d391d93 (patch) | |
tree | d237acac7915db89829db7da1d0405f2e595a68b /rerere.c | |
parent | 7a618493facb79639231f797e492fab51fac2ba4 (diff) |
tree-wide: apply equals-null.cocci
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'rerere.c')
-rw-r--r-- | rerere.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; } |