Skip to content

Commit 66ab301

Browse files
felipecgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Felipe Contreras <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 59d3924 commit 66ab301

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

contrib/completion/git-prompt.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ __git_ps1_colorize_gitstring ()
259259
r="$c_clear$r"
260260
}
261261

262-
eread ()
262+
__git_eread ()
263263
{
264264
f="$1"
265265
shift
@@ -328,20 +328,20 @@ __git_ps1 ()
328328
local step=""
329329
local total=""
330330
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
334334
if [ -f "$g/rebase-merge/interactive" ]; then
335335
r="|REBASE-i"
336336
else
337337
r="|REBASE-m"
338338
fi
339339
else
340340
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
343343
if [ -f "$g/rebase-apply/rebasing" ]; then
344-
eread "$g/rebase-apply/head-name" b
344+
__git_eread "$g/rebase-apply/head-name" b
345345
r="|REBASE"
346346
elif [ -f "$g/rebase-apply/applying" ]; then
347347
r="|AM"
@@ -365,7 +365,7 @@ __git_ps1 ()
365365
b="$(git symbolic-ref HEAD 2>/dev/null)"
366366
else
367367
local head=""
368-
if ! eread "$g/HEAD" head; then
368+
if ! __git_eread "$g/HEAD" head; then
369369
if [ $pcmode = yes ]; then
370370
PS1="$ps1pc_start$ps1pc_end"
371371
fi

0 commit comments

Comments
 (0)