{"thread":{"id":"47199","subject":"[buglet] gitk and git cherry-pick --abort interaction","startedAt":"2017-11-13T21:57:28Z","lastAt":"2017-11-13T21:57:28Z","messageCount":1,"participants":["Chris Packham"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"332453","messageId":"CAFOYHZCvKG+3c3yvW1vdEwx+iQizogTF4wgFKAYCjZAvLUv1=w@mail.gmail.com","threadId":"47199","inReplyTo":null,"subject":"[buglet] gitk and git cherry-pick --abort interaction","fromName":"Chris Packham","fromEmail":"judge.packham@gmail.com","sentAt":"2017-11-13T21:57:22Z","receivedAt":"2017-11-13T21:57:28Z","isPatch":false,"sender":{"key":"judge.packham@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155667?v=4"},"body":"Apologies in advance for the vagueness of this bug report.\n\nI was juggling a few patches around in a git repo (happens to be linux\nbut that's probably not particularly relevant).\n\nI'd been reverting, rebasing and cherry-picking on the CLI. Then I\nfound I needed one more commit which I located with gitk. Since it was\nalready open I used the cherry-pick option within gitk, there were\nconflicts and gitk invoked git citool for me.\n\nAt that point I decided to bail on the cherry-pick and closed citool\nand gitk and ran git cherry-pick --abort from the command line and\nthat’s where things got weird. The abort put me on a different commit\nthan where I started (which happened to be the commit from a previous\nam --abort). I'm guessing gitk's cherry-pick doesn't fully record the\ninformation in a way that the cli counterpart expects.\n\nI'll try and get a reproduction going but in the meantime some info\nfrom my terminal history and reflog might help.\n\n $ git --version\n git version 2.15.0\n\n $ cd linux/\n linux (edac u+10)$ gitk\n # not pictured here cherry-picking one commit in gitk and citool running\n linux (edac *+|CHERRY-PICKING u+10)$\n linux (edac *+|CHERRY-PICKING u+10)$ git cherry-pick --abort\n linux (edac u+13)$\n\nHere's some info from the reflog abridged so gmail doesn't eat it.\n\n linux (edac u+13)$ git reflog\n d2b10042ccaf (HEAD -> edac) HEAD@{0}: reset: moving to d2b10042ccaf\n 67ebefac4b7e HEAD@{1}: rebase -i (finish): returning to refs/heads/edac\n ...  HEAD@{2} through HEAD@{33} are rebase/commit/am/cherry-pick\n d2b10042ccaf (HEAD -> edac) HEAD@{34}: am --abort\n\nThanks,\nChris\n"}]}