提交 66ab301c 编写于 作者: F Felipe Contreras 提交者: Junio C Hamano

contrib: completion: fix 'eread()' namespace

Otherwise it might collide with a function of the same name in the
user's environment.
Suggested-by: NSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: NFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 59d3924f
......@@ -259,7 +259,7 @@ __git_ps1_colorize_gitstring ()
r="$c_clear$r"
}
eread ()
__git_eread ()
{
f="$1"
shift
......@@ -328,9 +328,9 @@ __git_ps1 ()
local step=""
local total=""
if [ -d "$g/rebase-merge" ]; then
eread "$g/rebase-merge/head-name" b
eread "$g/rebase-merge/msgnum" step
eread "$g/rebase-merge/end" total
__git_eread "$g/rebase-merge/head-name" b
__git_eread "$g/rebase-merge/msgnum" step
__git_eread "$g/rebase-merge/end" total
if [ -f "$g/rebase-merge/interactive" ]; then
r="|REBASE-i"
else
......@@ -338,10 +338,10 @@ __git_ps1 ()
fi
else
if [ -d "$g/rebase-apply" ]; then
eread "$g/rebase-apply/next" step
eread "$g/rebase-apply/last" total
__git_eread "$g/rebase-apply/next" step
__git_eread "$g/rebase-apply/last" total
if [ -f "$g/rebase-apply/rebasing" ]; then
eread "$g/rebase-apply/head-name" b
__git_eread "$g/rebase-apply/head-name" b
r="|REBASE"
elif [ -f "$g/rebase-apply/applying" ]; then
r="|AM"
......@@ -365,7 +365,7 @@ __git_ps1 ()
b="$(git symbolic-ref HEAD 2>/dev/null)"
else
local head=""
if ! eread "$g/HEAD" head; then
if ! __git_eread "$g/HEAD" head; then
if [ $pcmode = yes ]; then
PS1="$ps1pc_start$ps1pc_end"
fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册