diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-13 11:53:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-13 11:53:14 -0700 |
| commit | 6308767f0bb58116cb405e1f4f77f5dfc1589920 (patch) | |
| tree | 0ce2de7b3fa470bd46592c3a6d9765d1de794e21 /contrib | |
| parent | 998f84075acbdc02eaa3b1b0d0f96a3f2a9165a6 (diff) | |
| parent | 66ab301c165b5ba6395b7bcc7cf35a7592f9f46f (diff) | |
| download | git-6308767f0bb58116cb405e1f4f77f5dfc1589920.tar.gz | |
Merge branch 'fc/prompt-zsh-read-from-file'
* fc/prompt-zsh-read-from-file:
contrib: completion: fix 'eread()' namespace
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 96b8087385..853425d005 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 |