From: "SZEDER Gábor" <szeder@ira.uka.de>
To: git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>, "SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH] fixup! bash prompt: use bash builtins to find out current branch
Date: Tue, 18 Jun 2013 12:01:38 +0200 [thread overview]
Message-ID: <1371549698-16826-1-git-send-email-szeder@ira.uka.de> (raw)
In-Reply-To: <20130618094931.GB2204@goldbirke>
From: SZEDER Gábor <szeder@ira.uka.de>
---
On Tue, Jun 18, 2013 at 11:49:31AM +0200, SZEDER Gábor wrote:
> (Hmm, speaking of which, the
> patch reading HEAD might break setups using $PROMPT_COMMAND, because
> it might do a simple return without updating $PS1...)
Indeed. Here's the fixup.
contrib/completion/git-prompt.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 4e5c8efa..3c8c7b0d 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -362,7 +362,12 @@ __git_ps1 ()
b="$(git symbolic-ref HEAD 2>/dev/null)"
else
local head=""
- read head 2>/dev/null <"$g/HEAD" || return
+ if ! read head 2>/dev/null <"$g/HEAD"; then
+ if [ $pcmode = yes ]; then
+ PS1="$ps1pc_start$ps1pc_end"
+ fi
+ return
+ fi
# is it a symbolic ref?
b="${head#ref: }"
if [ "$head" = "$b" ]; then
--
1.8.3.1.487.g8f4672d
next prev parent reply other threads:[~2013-06-18 10:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 2:16 [PATCH v2 00/13] bash prompt speedup SZEDER Gábor
2013-06-18 2:16 ` [PATCH v2 01/13] bash prompt: fix redirection coding style in tests SZEDER Gábor
2013-06-18 2:16 ` [PATCH v2 02/13] bash prompt: fix here document indentation in interactive rebase test SZEDER Gábor
2013-06-18 5:54 ` Jeff King
2013-06-18 2:16 ` [PATCH v2 03/13] completion, bash prompt: move __gitdir() tests to completion test suite SZEDER Gábor
2013-06-18 2:16 ` [PATCH v2 04/13] bash prompt: add a test for symbolic link symbolic refs SZEDER Gábor
2013-06-18 2:16 ` [PATCH v2 05/13] bash prompt: return early from __git_ps1() when not in a git repository SZEDER Gábor
2013-06-18 2:16 ` [PATCH v2 06/13] bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir() SZEDER Gábor
2013-06-18 4:16 ` Eric Sunshine
2013-06-18 2:17 ` [PATCH v2 07/13] bash prompt: use bash builtins to find out rebase state SZEDER Gábor
2013-06-18 2:17 ` [PATCH v2 08/13] bash prompt: use bash builtins to find out current branch SZEDER Gábor
2013-06-18 2:17 ` [PATCH v2 09/13] bash prompt: use bash builtins to get detached HEAD abbrev. object name SZEDER Gábor
2013-06-18 2:17 ` [PATCH v2 10/13] bash prompt: combine 'git rev-parse' executions SZEDER Gábor
2013-06-18 6:05 ` Jeff King
2013-06-18 9:49 ` SZEDER Gábor
2013-06-18 10:01 ` SZEDER Gábor [this message]
2013-06-18 2:17 ` [PATCH v2 11/13] bash prompt: use bash builtins to check stash state SZEDER Gábor
2013-06-18 2:17 ` [PATCH v2 12/13] bash prompt: avoid command substitution when checking for untracked files SZEDER Gábor
2013-06-18 2:17 ` [PATCH v2 13/13] bash prompt: avoid command substitution when finalizing gitstring SZEDER Gábor
2013-06-18 2:28 ` [PATCH v2 00/13] bash prompt speedup SZEDER Gábor
2013-06-18 16:48 ` Junio C Hamano
2013-06-18 19:35 ` Simon Oosthoek
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=1371549698-16826-1-git-send-email-szeder@ira.uka.de \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).