git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: 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: Thu, 13 Jun 2019 12:24:32 -0400	[thread overview]
Message-ID: <20190613162432.GA12128@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqr27xwjwj.fsf@gitster-ct.c.googlers.com>

On Thu, Jun 13, 2019 at 09:05:16AM -0700, Junio C Hamano wrote:

> aleksandrs@ledovskis.lv writes:
> 
> > My repo indeed contains a ".git/sequencer/todo" file which
> > contains references to commits long-gone (i.e., rebased).
> > Renaming or deleting this file stops whines about "error: could
> > not parse".
> 
> Interesting.  So in short, when the repository has leftover
> sequencer state file that is not in use, "git status parse" thing
> (whatever it is---are you getting it when you run "git status"
> command???)---is not careful enough to notice that it does not
> matter even if that leftover file is unusable.
> 
> 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? 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.

-Peff

  reply	other threads:[~2019-06-13 16:24 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 [this message]
2019-06-13 17:43             ` Phillip Wood
2019-06-13 19:00               ` Jeff King
2019-06-25 13:25               ` Phillip Wood
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=20190613162432.GA12128@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=aleksandrs@ledovskis.lv \
    --cc=espen@inspired.no \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).