Re: [PATCH 4/7] rerere: do not record failed conflict resolution data
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 17, 2026, 19:34 UTC
- Message-ID
- <xmqq5x03u0xz.fsf@gitster.g>
- In-Reply-To
- <bd9e06e46c6debb5a8fc8f1d3821250ca110d5ef.1789667556.git.gitgitgadget@gmail.com>
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 11 quoted lines
> @@ -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.