summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-28 17:43:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-28 17:43:38 (GMT)
commit9f279af86206e36e9ecd25ab81515e0af81bf2ad (patch)
tree79afb4157a941d42077988c9bd2bb6c6c0dd195c /contrib
parent2125261b631c429175821299ece33449dbd3ab96 (diff)
parent52ec889d1ab3405796dd4fb4c262f950927a6b71 (diff)
downloadgit-9f279af86206e36e9ecd25ab81515e0af81bf2ad.zip
git-9f279af86206e36e9ecd25ab81515e0af81bf2ad.tar.gz
git-9f279af86206e36e9ecd25ab81515e0af81bf2ad.tar.bz2
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.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 202e2e5..7b732d2 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