From: "SZEDER Gábor" <szeder@ira.uka.de>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Ted Pavlic <ted@tedpavlic.com>, git@vger.kernel.org
Subject: Re: [PATCH] bash: display git prompt in case of merge conflict during rebase
Date: Thu, 28 May 2009 19:01:47 +0200 [thread overview]
Message-ID: <20090528170147.GN6570@neumann> (raw)
In-Reply-To: <1243527441-3394-1-git-send-email-szeder@ira.uka.de>
On Thu, May 28, 2009 at 06:17:21PM +0200, SZEDER Gábor wrote:
> Since e5dd864a (completion: Better __git_ps1 support when not in
> working directory, 2009-02-11) the git prompt becomes empty, if we hit
> a merge conflict during a rebase.
>
> e5dd864a added an if statement at the end of __git_ps1 to only display
> anything in the prompt, if the branch name is not empty. This caused
> the empty prompt in the "merge conflict during rebase" case, because
> in this case we display neither the branch name nor the abbreviated
> SHA1, the ongoing rebase is identified.
^- although...
next prev parent reply other threads:[~2009-05-28 17:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-28 16:17 [PATCH] bash: display git prompt in case of merge conflict during rebase SZEDER Gábor
2009-05-28 17:01 ` SZEDER Gábor [this message]
2009-05-29 12:00 ` [PATCH] bash: remove always true if statement from __git_ps1() SZEDER Gábor
2009-05-29 15:03 ` Shawn O. Pearce
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=20090528170147.GN6570@neumann \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
--cc=ted@tedpavlic.com \
/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).