From: Junio C Hamano <gitster@pobox.com>
To: sverre@rabbelier.nl
Cc: Git Mailinglist <git@vger.kernel.org>
Subject: Re: git-am annoyance
Date: Tue, 27 Jan 2009 14:30:23 -0800 [thread overview]
Message-ID: <7vr62o1iww.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <bd6139dc0901271407i4406d5e6u6db1df9e5a7bdc4f@mail.gmail.com> (Sverre Rabbelier's message of "Tue, 27 Jan 2009 23:07:14 +0100")
Sverre Rabbelier <alturin@gmail.com> writes:
> Observe what happens if, on accident, rather than running a alias
> (amendall), the 'tab' didn't catch on:
> $ git am
> ^C
It wants to read from the stdin as "git am < mbox" is a valid usage.
A patch to detect that the input was killed with ^C and clean things up
would be welcome. Also we may be able to detect "-t 0", too.
> $ # ok, now what do I do?
Here is one thing you could do.
$ PS1=': $(__git_ps1 "%s"); '
: master|AM/REBASE;
: master|AM/REBASE; git am --abort
But you are right. We should be able to detect this.
I think it was just people who often use "am" are so used to correctly the
command that the state where no state files are created didn't happen
often and never reported the breakage.
next prev parent reply other threads:[~2009-01-27 22:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-27 22:07 git-am annoyance Sverre Rabbelier
2009-01-27 22:30 ` Junio C Hamano [this message]
2009-01-27 22:37 ` Sverre Rabbelier
2009-01-27 22:49 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vr62o1iww.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sverre@rabbelier.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).