mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
9ad3f74cb6
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue