diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-28 18:43:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 18:43:38 +0100 |
| commit | 9f279af86206e36e9ecd25ab81515e0af81bf2ad (patch) | |
| tree | 79afb4157a941d42077988c9bd2bb6c6c0dd195c /contrib | |
| parent | Merge branch 'jk/split-broken-ident' (diff) | |
| parent | bash prompt: don't use '+=' operator in show upstream code path (diff) | |
| download | git-9f279af86206e36e9ecd25ab81515e0af81bf2ad.tar.xz git-9f279af86206e36e9ecd25ab81515e0af81bf2ad.zip | |
Merge branch 'sg/prompt-svn-remote-fix'
Bash portability fix.
* sg/prompt-svn-remote-fix:
bash prompt: don't use '+=' operator in show upstream code path
Diffstat (limited to 'contrib')
| -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 202e2e520f..7b732d2aeb 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -111,7 +111,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 |