From: Junio C Hamano Date: Thu, 17 Sep 2026 19:34:16 GMT Subject: Re: [PATCH 4/7] rerere: do not record failed conflict resolution data Message-ID: In-Reply-To: "Johannes Schindelin via GitGitGadget" writes: > @@ -778,7 +798,9 @@ static void do_rerere_one_path(struct index_state *istate, > assign_variant(id); > > variant = id->variant; > - handle_file(istate, path, NULL, rerere_path(&buf, id, "preimage")); > + if (handle_file(istate, path, NULL, > + rerere_path(&buf, id, "preimage")) < 0) > + goto out; > if (id->collection->status[variant] & RR_HAS_POSTIMAGE) { > const char *path = rerere_path(&buf, id, "postimage"); > if (unlink(path)) Good to see this one, which is the only unchecked call to the handle_file() function, checked for an error. Looking good. Thanks.