From: Philip Oakley <philipoakley@iee.email>
To: phillip.wood@dunelm.org.uk,
Mikko Rantalainen <mikko.rantalainen@peda.net>,
git@vger.kernel.org
Subject: Re: RFE: teach gitk to automatically mark .git/rebase-merge/stopped-sha
Date: Tue, 5 May 2020 21:42:45 +0100 [thread overview]
Message-ID: <18b66ddb-b490-883e-43e9-3c04f9d95448@iee.email> (raw)
In-Reply-To: <79d0c40d-3bfb-2902-3538-1eb1a6cd68fe@gmail.com>
Hi Phillip,
On 05/05/2020 20:42, Phillip Wood wrote:
> Hi Mikko
>
> On 04/05/2020 09:26, Mikko Rantalainen wrote:
>> 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.
>
> Since git v2.17 rebase which should set REBASE_HEAD to point to the
> failing commit.
Is that a proper Pseudo Ref or is it just a temporary feature during a
rebase?
I see it's only mentioned once in the Documentation in the Rebase man page.
(I see a lot of discussion on the reftable support, with the pseudo refs
being at least one sticking point.)
Philip
>
> Best Wishes
>
> Phillip
>
>> 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?
>>
prev parent reply other threads:[~2020-05-05 20:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 8:26 RFE: teach gitk to automatically mark .git/rebase-merge/stopped-sha Mikko Rantalainen
2020-05-05 19:42 ` Phillip Wood
2020-05-05 20:42 ` Philip Oakley [this message]
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=18b66ddb-b490-883e-43e9-3c04f9d95448@iee.email \
--to=philipoakley@iee.email \
--cc=git@vger.kernel.org \
--cc=mikko.rantalainen@peda.net \
--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).