contrib: completion: fix 'eread()' namespace
Otherwise it might collide with a function of the same name in the user's environment. Suggested-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 13, 2014 at 08:21 UTC
66ab301c165b5ba6395b7bcc7cf35a7592f9f46f
1 file changed
+8
-8
contrib/completion/git-prompt.sh
+8
-8
@@ -259,7 +259,7 @@ __git_ps1_colorize_gitstring ()
259
r="$c_clear$r"
260
}
261
262
-eread ()
262
+__git_eread ()
263
{
264
f="$1"
265
shift
@@ -328,9 +328,9 @@ __git_ps1 ()
328
local step=""
329
local total=""
330
if [ -d "$g/rebase-merge" ]; then
331
- eread "$g/rebase-merge/head-name" b
332
- eread "$g/rebase-merge/msgnum" step
333
- eread "$g/rebase-merge/end" total
331
+ __git_eread "$g/rebase-merge/head-name" b
332
+ __git_eread "$g/rebase-merge/msgnum" step
333
+ __git_eread "$g/rebase-merge/end" total
334
if [ -f "$g/rebase-merge/interactive" ]; then
335
r="|REBASE-i"
336
else
@@ -338,10 +338,10 @@ __git_ps1 ()
338
fi
339
else
340
if [ -d "$g/rebase-apply" ]; then
341
- eread "$g/rebase-apply/next" step
342
- eread "$g/rebase-apply/last" total
341
+ __git_eread "$g/rebase-apply/next" step
342
+ __git_eread "$g/rebase-apply/last" total
343
if [ -f "$g/rebase-apply/rebasing" ]; then
344
- eread "$g/rebase-apply/head-name" b
344
+ __git_eread "$g/rebase-apply/head-name" b
345
r="|REBASE"
346
elif [ -f "$g/rebase-apply/applying" ]; then
347
r="|AM"
@@ -365,7 +365,7 @@ __git_ps1 ()
365
b="$(git symbolic-ref HEAD 2>/dev/null)"
366
else
367
local head=""
368
- if ! eread "$g/HEAD" head; then
368
+ if ! __git_eread "$g/HEAD" head; then
369
if [ $pcmode = yes ]; then
370
PS1="$ps1pc_start$ps1pc_end"
371
fi