mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bash-completion: Fix __git_ps1 to work with "set -u"

Browse Source 
Define several variables in __git_ps1 to avoid errors under "set -u" semantics.

__git_ps1 seems to have been missed when the rest of the file was fixed in
25a31f8.

Signed-off-by: Andrew Sayers <andrew-git@pileofstuff.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Andrew Sayers
2010-06-17 22:32:16 +01:00
committed by Junio C Hamano
parent 45a0ee1163
commit 6c44b6406b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/completion/git-completion.bash
View File

@ -84,8 +84,8 @@ __git_ps1 ()
{ {
local g="$(__gitdir)" local g="$(__gitdir)"
if [ -n "$g" ]; then if [ -n "$g" ]; then
local r local r=""
local b local b=""
if [ -f "$g/rebase-merge/interactive" ]; then if [ -f "$g/rebase-merge/interactive" ]; then
r="|REBASE-i" r="|REBASE-i"
b="$(cat "$g/rebase-merge/head-name")" b="$(cat "$g/rebase-merge/head-name")"
@ -127,11 +127,11 @@ __git_ps1 ()
} }
fi fi
local w local w=""
local i local i=""
local s local s=""
local u local u=""
local c local c=""
if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then