From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Robin Rosenberg <robin.rosenberg@dewire.com>,
git@vger.kernel.org
Subject: Re: [PATCH] Improve bash prompt to detect merge / rebase in progress
Date: Sun, 2 Sep 2007 01:35:00 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0709020133540.28586@racer.site> (raw)
In-Reply-To: <20070901222036.GH18160@spearce.org>
Hi,
On Sat, 1 Sep 2007, Shawn O. Pearce wrote:
> Junio C Hamano <gitster@pobox.com> wrote:
> > Robin Rosenberg <robin.rosenberg@dewire.com> writes:
> > >
> > > + local g="$(git rev-parse --git-dir 2>/dev/null)"
> > > + if [ -n "$g" ]; then
> > > + local r
> > > + local b
> > > + if [ -d "$g/../.dotest" ]
> > > + then
> > > + local b="$(git symbolic-ref HEAD 2>/dev/null)"
> > > + r="|REBASEING"
> >
> > I might be in the middle of resolving a conflicted "git am".
>
> And there's no way to tell the difference either.
AFAICT git-am creates an "info" file in .dotest/.
And interactive rebase is detectable by the "interactive" file in
.git/.dotest-merge/.
Ciao,
Dscho
next prev parent reply other threads:[~2007-09-02 0:36 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-01 10:22 [PATCH] Improve bash prompt to detect merge / rebase in progress Robin Rosenberg
2007-09-01 18:07 ` Junio C Hamano
2007-09-01 22:20 ` Shawn O. Pearce
2007-09-02 0:35 ` Johannes Schindelin [this message]
2007-09-02 0:44 ` Shawn O. Pearce
2007-09-01 23:02 ` Johannes Schindelin
2007-09-01 23:52 ` Robin Rosenberg
2007-09-02 10:18 ` Johannes Sixt
2007-09-02 10:40 ` Robin Rosenberg
2007-09-04 7:13 ` Shawn O. Pearce
2007-09-30 0:20 ` [PATCH] Improve bash prompt to detect various states like an unfinished merge Robin Rosenberg
2007-10-01 8:15 ` Junio C Hamano
2007-10-01 18:29 ` Robin Rosenberg
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=Pine.LNX.4.64.0709020133540.28586@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=robin.rosenberg@dewire.com \
--cc=spearce@spearce.org \
/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).