threads / bug / 34118

[Bug?] "am --abort" broken?

Subject: [Bug?] "am --abort" broken?

## tl;dr

3 messages between Jun 12, 2013 and Jun 13, 2013.

replies: 2people: 2as markdown or json

Junio C Hamano· Jun 12, 2013, 22:38 UTC · lore

This is somewhat minor but will confuse people who do not know how to manually recover from. Start "am" without giving an input file by mistake:

    $ git am ;# no input file
    ^C

At this point, you are still in "am" session; completion will tell you that you are in a middle of "am/rebase". A more recent way to get out of this is to use "am --abort", but you get this:

    $ git am --abort
    Resolve operation not in progress, we are not resuming.

"git am" from 'maint' will help you get out of it, or you can do it the old fashioned way:

    $ rm -fr .git/rebase-apply

I think this is a recent breakage after merging the topic to add "rebase --autostash", but I haven't looked into it yet.

Ramkumar Ramachandra· Jun 13, 2013, 04:00 UTC · re: Junio C Hamano · lore

Re: [Bug?] "am --abort" broken?

Junio C Hamano wrote:
Show 5 quoted lines
>     $ git am ;# no input file
>     ^C
>
>     $ git am --abort
>     Resolve operation not in progress, we are not resuming.
I tried it on git 1.8.3, and this only incidentally "seems" to half-work (?)

% git am ^C % git am --abort cat: /home/artagnon/src/git/.git/rebase-apply/next: No such file or directory % git status # On branch master # Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. # nothing to commit, working directory clean

In the process of aborting, it blew away one commit!
> I think this is a recent breakage after merging the topic to add
> "rebase --autostash", but I haven't looked into it yet.

Yes, I can confirm that my topic introduced this bug, and I apologize for not having caught it. I'm looking into the problem.

Thanks.
Junio C Hamano· Jun 13, 2013, 04:17 UTC · re: Ramkumar Ramachandra · lore

Re: [Bug?] "am --abort" broken?

Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 5 quoted lines
>> I think this is a recent breakage after merging the topic to add
>> "rebase --autostash", but I haven't looked into it yet.
>
> Yes, I can confirm that my topic introduced this bug, and I apologize
> for not having caught it.  I'm looking into the problem.
No need to apologize; nobody caught it during the review.
And thanks for volunteering.

← back to recent threads