From: Phil Hord <phil.hord@gmail.com>
To: Git <git@vger.kernel.org>
Subject: Exposing the states of sequencer, etc.
Date: Fri, 19 Apr 2019 10:57:33 -0700 [thread overview]
Message-ID: <CABURp0p6RmwjW4BN4qPv5iBKC_kzZFGyKJxuWw=+pEpjZGtV_A@mail.gmail.com> (raw)
"Junio C Hamano via vger.kernel.org" writes:
> > When cherry-picking or reverting a sequence of commits and if the final
> > pick/revert has conflicts and the user uses `git commit` to commit the
> > conflict resolution and does not run `git cherry-pick --continue` then
> > the sequencer state is left behind. This can cause problems later.
> > ...
> I've certainly seen this myself. Do you use command line prompt
> support to remind you of the operation in progress? I do, and I
> have a suspicion that it did not help me in this situation by
> ceasing to tell me that I have leftover state files after a manual
> commit of the final step that conflicted and gave control back to
> me.
Is there some place today that we explain the many rules Git uses to
determine the operations in progress? I once had a patch to do this
in code, but I think I let it die in committee. It was something
like:
$ git status --show-progress-state
cherry-pick, conflicts, untracked
It would be helpful first to have an API for this, of course, though I
think that's where I got mired before.
I'm willing to take it on again, if there's not already some alternative.
next reply other threads:[~2019-04-19 18:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-19 17:57 Phil Hord [this message]
2019-04-19 19:46 ` Exposing the states of sequencer, etc Jeff King
2019-04-20 6:52 ` Phil Hord
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='CABURp0p6RmwjW4BN4qPv5iBKC_kzZFGyKJxuWw=+pEpjZGtV_A@mail.gmail.com' \
--to=phil.hord@gmail.com \
--cc=git@vger.kernel.org \
/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).