{"thread":{"id":"34118","subject":"[Bug?] \"am --abort\" broken?","startedAt":"2013-06-12T22:38:02Z","lastAt":"2013-06-13T04:17:10Z","messageCount":3,"participants":["Junio C Hamano","Ramkumar Ramachandra"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"220682","messageId":"7vsj0nymyd.fsf@alter.siamese.dyndns.org","threadId":"34118","inReplyTo":null,"subject":"[Bug?] \"am --abort\" broken?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-12T22:38:02Z","receivedAt":"2013-06-12T22:38:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This is somewhat minor but will confuse people who do not know how\nto manually recover from.  Start \"am\" without giving an input file\nby mistake:\n\n    $ git am ;# no input file\n    ^C\n\nAt this point, you are still in \"am\" session; completion will tell\nyou that you are in a middle of \"am/rebase\".  A more recent way to\nget out of this is to use \"am --abort\", but you get this:\n\n    $ git am --abort\n    Resolve operation not in progress, we are not resuming.\n\n\"git am\" from 'maint' will help you get out of it, or you can do it\nthe old fashioned way:\n\n    $ rm -fr .git/rebase-apply\n\nI think this is a recent breakage after merging the topic to add\n\"rebase --autostash\", but I haven't looked into it yet.\n"},{"id":"220689","messageId":"CALkWK0ksCupC183X-XDwCcscHkQXq9whxxYeWLjR2FpH50ycHA@mail.gmail.com","threadId":"34118","inReplyTo":"7vsj0nymyd.fsf@alter.siamese.dyndns.org","subject":"Re: [Bug?] \"am --abort\" broken?","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-06-13T04:00:31Z","receivedAt":"2013-06-13T04:00:31Z","isPatch":false,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Junio C Hamano wrote:\n>     $ git am ;# no input file\n>     ^C\n>\n>     $ git am --abort\n>     Resolve operation not in progress, we are not resuming.\n\nI tried it on git 1.8.3, and this only incidentally \"seems\" to half-work (?)\n\n% git am\n^C\n% git am --abort\ncat: /home/artagnon/src/git/.git/rebase-apply/next: No such file or directory\n% git status\n# On branch master\n# Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.\n#\nnothing to commit, working directory clean\n\nIn the process of aborting, it blew away one commit!\n\n> I think this is a recent breakage after merging the topic to add\n> \"rebase --autostash\", but I haven't looked into it yet.\n\nYes, I can confirm that my topic introduced this bug, and I apologize\nfor not having caught it.  I'm looking into the problem.\n\nThanks.\n"},{"id":"220690","messageId":"7v7ghyy795.fsf@alter.siamese.dyndns.org","threadId":"34118","inReplyTo":"CALkWK0ksCupC183X-XDwCcscHkQXq9whxxYeWLjR2FpH50ycHA@mail.gmail.com","subject":"Re: [Bug?] \"am --abort\" broken?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-13T04:17:10Z","receivedAt":"2013-06-13T04:17:10Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n>> I think this is a recent breakage after merging the topic to add\n>> \"rebase --autostash\", but I haven't looked into it yet.\n>\n> Yes, I can confirm that my topic introduced this bug, and I apologize\n> for not having caught it.  I'm looking into the problem.\n\nNo need to apologize; nobody caught it during the review.\n\nAnd thanks for volunteering.\n"}]}