From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: [PATCH 1/2] sequencer: clear CHERRY_PICK_HEAD upon dropping a become-empty commit
Date: Wed, 11 Mar 2020 13:18:42 -0700 [thread overview]
Message-ID: <xmqq5zfahcgt.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200311192720.GB27978@coredump.intra.peff.net> (Jeff King's message of "Wed, 11 Mar 2020 15:27:20 -0400")
Jeff King <peff@peff.net> writes:
> On Wed, Mar 11, 2020 at 11:38:18AM -0700, Junio C Hamano wrote:
>
>> >> } 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.
next prev parent reply other threads:[~2020-03-11 20:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-11 5:13 [PATCH 0/2] Fix 2.26.0 rebase regression and documentation shortcoming Elijah Newren via GitGitGadget
2020-03-11 5:13 ` [PATCH 1/2] sequencer: clear CHERRY_PICK_HEAD upon dropping a become-empty commit Elijah Newren via GitGitGadget
2020-03-11 10:30 ` Phillip Wood
2020-03-11 18:38 ` Junio C Hamano
2020-03-11 19:27 ` Jeff King
2020-03-11 20:18 ` Junio C Hamano [this message]
2020-03-11 5:13 ` [PATCH 2/2] git-rebase.txt: highlight backend differences with commit rewording Elijah Newren via GitGitGadget
2020-03-11 15:30 ` [PATCH v2 0/2] Fix 2.26.0 rebase regression and documentation shortcoming Elijah Newren via GitGitGadget
2020-03-11 15:30 ` [PATCH v2 1/2] sequencer: clear state upon dropping a become-empty commit Elijah Newren via GitGitGadget
2020-03-11 16:34 ` Jeff King
2020-03-11 17:16 ` Elijah Newren
2020-03-11 19:33 ` Jeff King
2020-03-11 15:30 ` [PATCH v2 2/2] git-rebase.txt: highlight backend differences with commit rewording Elijah Newren via GitGitGadget
2020-03-11 16:36 ` Jeff King
2020-03-11 19:10 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq5zfahcgt.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).