diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:38:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:38:14 -0700 |
| commit | f79467ef364eb06ee9b49344cdec02e2bd1f2cc7 (patch) | |
| tree | 84f2432aeb0d6c4fc78f2ecb1be1933db7c062de | |
| parent | fc78791b7c2cb17a461e7881ee4585b3eafda4b6 (diff) | |
| parent | d0583da838afbc5e039b9f0cbbb9b1fb3aa1f1ae (diff) | |
| download | git-f79467ef364eb06ee9b49344cdec02e2bd1f2cc7.tar.gz | |
Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint
* tg/maint-zsh-svn-remote-prompt:
prompt: fix show upstream with svn and zsh
| -rw-r--r-- | contrib/completion/git-prompt.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index eaf5c369aa..b6b1534c02 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -124,7 +124,7 @@ __git_ps1_show_upstream () fi ;; svn-remote.*.url) - svn_remote[ $((${#svn_remote[@]} + 1)) ]="$value" + svn_remote[$((${#svn_remote[@]} + 1))]="$value" svn_url_pattern+="\\|$value" upstream=svn+git # default upstream is SVN if available, else git ;; @@ -146,10 +146,11 @@ __git_ps1_show_upstream () svn*) # get the upstream from the "git-svn-id: ..." in a commit message # (git-svn uses essentially the same procedure internally) - local svn_upstream=($(git log --first-parent -1 \ + local -a svn_upstream + svn_upstream=($(git log --first-parent -1 \ --grep="^git-svn-id: \(${svn_url_pattern#??}\)" 2>/dev/null)) if [[ 0 -ne ${#svn_upstream[@]} ]]; then - svn_upstream=${svn_upstream[ ${#svn_upstream[@]} - 2 ]} + svn_upstream=${svn_upstream[${#svn_upstream[@]} - 2]} svn_upstream=${svn_upstream%@*} local n_stop="${#svn_remote[@]}" for ((n=1; n <= n_stop; n++)); do |