{"thread":{"id":"53388","subject":"RFE: teach gitk to automatically mark .git/rebase-merge/stopped-sha","startedAt":"2020-05-04T08:36:25Z","lastAt":"2020-05-05T20:42:48Z","messageCount":3,"participants":["Mikko Rantalainen","Phillip Wood","Philip Oakley"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"396892","messageId":"1dbc41e9-b2e5-0b77-26c4-c912c82f9069@peda.net","threadId":"53388","inReplyTo":null,"subject":"RFE: teach gitk to automatically mark .git/rebase-merge/stopped-sha","fromName":"Mikko Rantalainen","fromEmail":"mikko.rantalainen@peda.net","sentAt":"2020-05-04T08:26:18Z","receivedAt":"2020-05-04T08:36:25Z","isPatch":false,"sender":{"key":"mikko.rantalainen@peda.net","avatar":"https://gravatar.com/avatar/e2d770957fa98e434c238272a8ee24c02ab5766ad140c18b9591045c0a49be58?d=mp&s=160"},"body":"While doing long rebases (I'm currently rebasing a feature branch with\n166 patches) and rebase stopping in the middle of rebase, locating the\nold patch in gitk is sometimes hard.\n\nCould gitk automatically mark the original patch that failed to rebase\nafter I press F5?\n\nThe failing original commit SHA-1 can be found in file\n.git/rebase-merge/stopped-sha but as far as I know, git does have\nlogical commit name similar to HEAD, ORIG_HEAD or anything else for this\ncase so there's no easy way to get already running gitk to mark this patch.\n\nOf course, doing the same thing for failed cherry-picks would be nice,\ntoo but in that case it's pretty clear where the source patch is.\n\nAs a workaround I currently have to do something like\n  git tag -f FAILED_HEAD $(cat .git/rebase-merge/stopped-sha)\nafter seeing rebase failure. Then I can hit F5 in gitk to easily locate\nthe source commit.\n\nPS. Is there a way to automatically run git tag -f FAILED_HEAD $(cat\n.git/rebase-merge/stopped-sha) if rebase fails in the middle of branch?\n\n-- \nMikko\n"},{"id":"397132","messageId":"79d0c40d-3bfb-2902-3538-1eb1a6cd68fe@gmail.com","threadId":"53388","inReplyTo":"1dbc41e9-b2e5-0b77-26c4-c912c82f9069@peda.net","subject":"Re: RFE: teach gitk to automatically mark .git/rebase-merge/stopped-sha","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2020-05-05T19:42:53Z","receivedAt":"2020-05-05T19:42:58Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Mikko\n\nOn 04/05/2020 09:26, Mikko Rantalainen wrote:\n> While doing long rebases (I'm currently rebasing a feature branch with\n> 166 patches) and rebase stopping in the middle of rebase, locating the\n> old patch in gitk is sometimes hard.\n> \n> Could gitk automatically mark the original patch that failed to rebase\n> after I press F5?\n> \n> The failing original commit SHA-1 can be found in file\n> .git/rebase-merge/stopped-sha but as far as I know, git does have\n> logical commit name similar to HEAD, ORIG_HEAD or anything else for this\n> case so there's no easy way to get already running gitk to mark this patch.\n\nSince git v2.17 rebase which should set REBASE_HEAD to point to the \nfailing commit.\n\nBest Wishes\n\nPhillip\n\n> Of course, doing the same thing for failed cherry-picks would be nice,\n> too but in that case it's pretty clear where the source patch is.\n> \n> As a workaround I currently have to do something like\n>    git tag -f FAILED_HEAD $(cat .git/rebase-merge/stopped-sha)\n> after seeing rebase failure. Then I can hit F5 in gitk to easily locate\n> the source commit.\n> \n> PS. Is there a way to automatically run git tag -f FAILED_HEAD $(cat\n> .git/rebase-merge/stopped-sha) if rebase fails in the middle of branch?\n> \n"},{"id":"397135","messageId":"18b66ddb-b490-883e-43e9-3c04f9d95448@iee.email","threadId":"53388","inReplyTo":"79d0c40d-3bfb-2902-3538-1eb1a6cd68fe@gmail.com","subject":"Re: RFE: teach gitk to automatically mark .git/rebase-merge/stopped-sha","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.email","sentAt":"2020-05-05T20:42:45Z","receivedAt":"2020-05-05T20:42:48Z","isPatch":false,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"Hi Phillip,\n\nOn 05/05/2020 20:42, Phillip Wood wrote:\n> Hi Mikko\n>\n> On 04/05/2020 09:26, Mikko Rantalainen wrote:\n>> While doing long rebases (I'm currently rebasing a feature branch with\n>> 166 patches) and rebase stopping in the middle of rebase, locating the\n>> old patch in gitk is sometimes hard.\n>>\n>> Could gitk automatically mark the original patch that failed to rebase\n>> after I press F5?\n>>\n>> The failing original commit SHA-1 can be found in file\n>> .git/rebase-merge/stopped-sha but as far as I know, git does have\n>> logical commit name similar to HEAD, ORIG_HEAD or anything else for this\n>> case so there's no easy way to get already running gitk to mark this\n>> patch.\n>\n> Since git v2.17 rebase which should set REBASE_HEAD to point to the\n> failing commit.\n\nIs that a proper Pseudo Ref or is it just a temporary feature during a\nrebase?\n\nI see it's only mentioned once in the Documentation in the Rebase man page.\n\n(I see a lot of discussion on the reftable support, with the pseudo refs\nbeing at least one sticking point.)\n\nPhilip\n>\n> Best Wishes\n>\n> Phillip\n>\n>> Of course, doing the same thing for failed cherry-picks would be nice,\n>> too but in that case it's pretty clear where the source patch is.\n>>\n>> As a workaround I currently have to do something like\n>>    git tag -f FAILED_HEAD $(cat .git/rebase-merge/stopped-sha)\n>> after seeing rebase failure. Then I can hit F5 in gitk to easily locate\n>> the source commit.\n>>\n>> PS. Is there a way to automatically run git tag -f FAILED_HEAD $(cat\n>> .git/rebase-merge/stopped-sha) if rebase fails in the middle of branch?\n>>\n\n"}]}