Re: [PATCH 1/2] sequencer: clear CHERRY_PICK_HEAD upon dropping a become-empty commit

Jeff King [off-list ref] writes:

On Wed, Mar 11, 2020 at 11:38:18AM -0700, Junio C Hamano wrote:

quoted

quoted

quoted

  	} else if (allow == 2) {
  		drop_commit = 1;
+		unlink(git_path_cherry_pick_head(r));

When this fails for whatever reason, do we need to do something
special?  The same question for MERGE_MSG Phillip mentioned.

I don't think there's much we _can_ do. The other call-sites seem to
just ignore failures. I suspect turning those into unlink_or_warn()
would be a good idea (and should be safe; it treats ENOENT as a noop, so
anything it reports should be an actual error worthy of the user's
attention).

But probably it would make sense to do that consistently for all of
those calls, and that doesn't need to be part of the 2.26 fixup.

Yes, I think that is a sensible way forward.

Thanks, all.