git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Mikko Rantalainen <mikko.rantalainen@peda.net>
To: git@vger.kernel.org
Subject: RFE: teach gitk to automatically mark .git/rebase-merge/stopped-sha
Date: Mon, 4 May 2020 11:26:18 +0300	[thread overview]
Message-ID: <1dbc41e9-b2e5-0b77-26c4-c912c82f9069@peda.net> (raw)

While doing long rebases (I'm currently rebasing a feature branch with
166 patches) and rebase stopping in the middle of rebase, locating the
old patch in gitk is sometimes hard.

Could gitk automatically mark the original patch that failed to rebase
after I press F5?

The failing original commit SHA-1 can be found in file
.git/rebase-merge/stopped-sha but as far as I know, git does have
logical commit name similar to HEAD, ORIG_HEAD or anything else for this
case so there's no easy way to get already running gitk to mark this patch.

Of course, doing the same thing for failed cherry-picks would be nice,
too but in that case it's pretty clear where the source patch is.

As a workaround I currently have to do something like
  git tag -f FAILED_HEAD $(cat .git/rebase-merge/stopped-sha)
after seeing rebase failure. Then I can hit F5 in gitk to easily locate
the source commit.

PS. Is there a way to automatically run git tag -f FAILED_HEAD $(cat
.git/rebase-merge/stopped-sha) if rebase fails in the middle of branch?

-- 
Mikko

             reply	other threads:[~2020-05-04  8:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-04  8:26 Mikko Rantalainen [this message]
2020-05-05 19:42 ` RFE: teach gitk to automatically mark .git/rebase-merge/stopped-sha Phillip Wood
2020-05-05 20:42   ` Philip Oakley

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=1dbc41e9-b2e5-0b77-26c4-c912c82f9069@peda.net \
    --to=mikko.rantalainen@peda.net \
    --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).