From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Nov 2013 22:36:45 +0000 (-0800)
Subject: Merge branch 'sg/prompt-svn-remote-fix' into maint
X-Git-Tag: v1.8.4.3~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9ad3f74cb6fe840b3bbf8d279443dc09c98400a5?hp=0ceb7537c11f60d15786fa12b7d9602c68ee1b29

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
---

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