From: Phillip Wood <phillip.wood123@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Elijah Newren <newren@gmail.com>, Duy Nguyen <pclouds@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v2 1/2] commit/reset: try to clean up sequencer state
Date: Wed, 17 Apr 2019 16:04:19 +0100 [thread overview]
Message-ID: <f1371b89-8f8b-d0b9-7bda-23f8cb5d0541@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1904171423370.46@tvgsbejvaqbjf.bet>
Hi Dscho
On 17/04/2019 13:26, Johannes Schindelin wrote:
> Hi,
>
> On Wed, 17 Apr 2019, Junio C Hamano wrote:
>
>> Phillip Wood <phillip.wood123@gmail.com> writes:
>>
>>> Avoid this potential problem by removing the sequencer state if we're
>>> committing or resetting the final pick in a sequence.
>>
>> The use-case story before this conclusion only mentioned "commit"
>> that concluded the multi-step cherry-pick/revert, and never talked
>> about "reset", which made my eyebrows to rise.
>>
>> As a part of "reset", we have already been removing CHERRY_PICK_HEAD
>> and REVERT_HEAD, so "git reset" during a conflicted "cherry-pick"
>> for example is already destructive and the user can no longer get
>> back to continuing the cherry-pick anyway after running it, even
>> without this patch. So from that point of view, it does make sense
>> to remove the other sequencer states at the same time.
>
> Do you mean to say that a `git reset` during `git cherry-pick <range>`
> aborts it?
No I mean it removes CHERRY_PICK_HEAD/REVERT_HEAD and so cancels the
conflicting pick/revert, it does not abort the operation as a whole. If
the conflicting pick/revert was the last in a range then we want it to
remove .git/sequencer as well as the ..._HEAD file as it is easy to
forget to run --continue in that case.
Best Wishes
Phillip
> In my experience, this is not the case. The advice printed out after a
> conflict even recommends to run `git reset` (followed by `git cherry-pick
> --continue`, in lieu of the `git cherry-pick --skip` we have yet to
> implement).
>
> So I don't think it is correct to say that `git reset` does not let the
> user get back to continuing a cherry-pick...
>
> Ciao,
> Dscho
>
next prev parent reply other threads:[~2019-04-17 15:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-29 16:30 [PATCH 0/2] A couple of cherry-pick related fixes Phillip Wood
2019-03-29 16:30 ` [PATCH 1/2] commit/reset: try to clean up sequencer state Phillip Wood
2019-04-01 8:28 ` Junio C Hamano
2019-04-08 14:15 ` Phillip Wood
2019-04-01 10:09 ` Duy Nguyen
2019-04-08 15:47 ` Phillip Wood
2019-03-29 16:30 ` [PATCH 2/2] fix cherry-pick/revert status after commit Phillip Wood
2019-04-01 8:34 ` Junio C Hamano
2019-04-08 14:17 ` Phillip Wood
2019-04-16 10:18 ` [PATCH v2 0/2] A couple of cherry-pick related fixes Phillip Wood
2019-04-16 10:18 ` [PATCH v2 1/2] commit/reset: try to clean up sequencer state Phillip Wood
2019-04-17 7:04 ` Junio C Hamano
2019-04-17 12:26 ` Johannes Schindelin
2019-04-17 15:04 ` Phillip Wood [this message]
2019-04-16 10:18 ` [PATCH v2 2/2] fix cherry-pick/revert status after commit Phillip Wood
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=f1371b89-8f8b-d0b9-7bda-23f8cb5d0541@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).