From: Phillip Wood <phillip.wood123@gmail.com>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: aleksandrs@ledovskis.lv,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Espen Antonsen <espen@inspired.no>,
git@vger.kernel.org
Subject: Re: Git status parse error after v.2.22.0 upgrade
Date: Tue, 25 Jun 2019 14:25:25 +0100 [thread overview]
Message-ID: <82f4aa37-51fa-4d1a-8221-d6dd37113c70@gmail.com> (raw)
In-Reply-To: <8981e6c8-eb20-fde7-2b4c-1fbf2057caef@gmail.com>
On 13/06/2019 18:43, Phillip Wood wrote:
> On 13/06/2019 17:24, Jeff King wrote:
>> On Thu, Jun 13, 2019 at 09:05:16AM -0700, Junio C Hamano wrote:
>>>
>>> Two issues "the sequencer" folks may want to address are
>>>
>>> (1) make the one that reads an irrelevant/stale 'todo' file more
>>> careful to ignore errors in such a file;
>>>
>>> (2) make the sequencer machinery more careful to clean up after it
>>> is done or it is aborted (for example, "git reset --hard"
>>> could remove these state files preemptively even when a rebase
>>> is not in progress, I would think).
>>>
>>> I think we already had some patches toward the latter recently.
>>
>> Maybe I am not understanding it correctly, but do you mean in (2) that
>> "git reset --hard" would always clear sequencer state?
>
> I think the commit Junio is referring to is
> b07d9bfd17 ("commit/reset: try to clean up sequencer state", 2019-04-16)
> which will only remove the sequencer directory if it stops after the
> pick was the last one in the series. The idea is that if cherry-pick
> stops for a conflict resolution on the last pick user commits the result
> directly or run reset without running `cherry-pick --continue`
> afterwards the sequencer state gets cleaned up properly.
>
>> That seems
>> undesirable to me, as I often use "git reset" to move the head around
>> during a rebase. (e.g., when using "rebase -i" to split apart I commit,
>> I stop on that commit, "git reset" back to the parent, and then
>> selectively "add -p" the various parts).
>>
>> Direction (1) seems quite sensible to me, though.
>
> Now that we try harder to clean up the sequencer state I wonder if that
> would just cover up bugs where the state has not been removed when it
> should have been.
When I wrote that it hadn't dawned on me that if there is an error the
status will not tell the user that a cherry-pick is in progress which is
what we really want so they are alerted to the stale sequencer state.
I've posted a series [1] to address this (sadly gitgitgadget wont let me
post it on this thread).
Best Wishes
Phillip
[1]
https://public-inbox.org/git/pull.275.git.gitgitgadget@gmail.com/T/#mf57a4ab95ba907fbf2d06ec64e9b676db158eace
> That can lead to unpleasant problems if the user
> aborts a single revert/cherry-pick when there is stale sequencer state
> around as it rewinds HEAD to the commit when the stale
> cherry-pick/revert was started as explained in the message to b07d9bfd17
> ("commit/reset: try to clean up sequencer state", 2019-04-16)
>
> If we do want to do something then maybe teaching gc not to collect
> commits listed in .git/sequencer/todo and
> .git/rebase-merge/git-rebase-todo would be useful.
>
> Best Wishes
>
> Phillip
>
>> -Peff
>>
>
next prev parent reply other threads:[~2019-06-25 13:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 12:58 Git status parse error after v.2.22.0 upgrade Espen Antonsen
2019-06-11 19:28 ` Johannes Schindelin
2019-06-12 12:47 ` Espen Antonsen
2019-06-12 18:47 ` Johannes Schindelin
2019-06-13 9:30 ` aleksandrs
2019-06-13 16:05 ` Junio C Hamano
2019-06-13 16:24 ` Jeff King
2019-06-13 17:43 ` Phillip Wood
2019-06-13 19:00 ` Jeff King
2019-06-25 13:25 ` Phillip Wood [this message]
2019-06-13 16:58 ` SZEDER Gábor
2019-06-13 17:11 ` Aleksandrs Ļedovskis
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=82f4aa37-51fa-4d1a-8221-d6dd37113c70@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=aleksandrs@ledovskis.lv \
--cc=espen@inspired.no \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).