diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-07 14:36:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-07 14:36:45 -0800 |
| commit | 9ad3f74cb6fe840b3bbf8d279443dc09c98400a5 (patch) | |
| tree | 2011dda6353fadb7c7c78e8d741e92c6f927084d | |
| parent | 0ceb7537c11f60d15786fa12b7d9602c68ee1b29 (diff) | |
| parent | 52ec889d1ab3405796dd4fb4c262f950927a6b71 (diff) | |
| download | git-9ad3f74cb6fe840b3bbf8d279443dc09c98400a5.tar.gz | |
Merge branch 'sg/prompt-svn-remote-fix' into maint
Bash prompting code to deal with an SVN remote as an upstream
were coded in a way not supported by older Bash versions (3.x).
* sg/prompt-svn-remote-fix:
bash prompt: don't use '+=' operator in show upstream code path
| -rw-r--r-- | contrib/completion/git-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index d6c61b2bde..998722cf7f 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -110,7 +110,7 @@ __git_ps1_show_upstream () ;; svn-remote.*.url) svn_remote[$((${#svn_remote[@]} + 1))]="$value" - svn_url_pattern+="\\|$value" + svn_url_pattern="$svn_url_pattern\\|$value" upstream=svn+git # default upstream is SVN if available, else git ;; esac |