* [Bug?] "am --abort" broken?
@ 2013-06-12 22:38 Junio C Hamano
2013-06-13 4:00 ` Ramkumar Ramachandra
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2013-06-12 22:38 UTC (permalink / raw)
To: git; +Cc: Ramkumar Ramachandra
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.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Bug?] "am --abort" broken?
2013-06-12 22:38 [Bug?] "am --abort" broken? Junio C Hamano
@ 2013-06-13 4:00 ` Ramkumar Ramachandra
2013-06-13 4:17 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Ramkumar Ramachandra @ 2013-06-13 4:00 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Junio C Hamano wrote:
> $ 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Bug?] "am --abort" broken?
2013-06-13 4:00 ` Ramkumar Ramachandra
@ 2013-06-13 4:17 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2013-06-13 4:17 UTC (permalink / raw)
To: Ramkumar Ramachandra; +Cc: git
Ramkumar Ramachandra <artagnon@gmail.com> writes:
>> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-13 4:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-12 22:38 [Bug?] "am --abort" broken? Junio C Hamano
2013-06-13 4:00 ` Ramkumar Ramachandra
2013-06-13 4:17 ` Junio C Hamano
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 NNTP newsgroup(s).