# [PATCH] contrib: completion: fix 'eread()' namespace 2 messages from 2014-05-13 to 2014-05-13. Participants: Felipe Contreras, Junio C Hamano. Thread: https://gitlist.dev/t/36648 ## Felipe Contreras, 2014-05-13 13:21 Subject: [PATCH] contrib: completion: fix 'eread()' namespace Message-ID: <1399987279-12487-1-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1399987279-12487-1-git-send-email-felipe.contreras%40gmail.com ``` Otherwise it might collide with a function of the same name in the user's environment. Suggested-by: SZEDER Gábor Signed-off-by: Felipe Contreras --- contrib/completion/git-prompt.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 96b8087..853425d 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -270,7 +270,7 @@ __git_ps1_colorize_gitstring () r="$c_clear$r" } -eread () +__git_eread () { f="$1" shift @@ -339,9 +339,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 @@ -349,10 +349,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" @@ -376,7 +376,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 -- 1.9.3+fc1 ``` ## Junio C Hamano, 2014-05-13 20:41 Subject: Re: [PATCH] contrib: completion: fix 'eread()' namespace Message-ID: URL: https://gitlist.dev/e/xmqqvbt9mmxg.fsf%40gitster.dls.corp.google.com In-Reply-To: <1399987279-12487-1-git-send-email-felipe.contreras@gmail.com> ``` A reasonable regression fix. Will queue for 2.0 final. Thanks. ```