Skip to content

Commit

Permalink
Merge branch 'sg/prompt-svn-remote-fix' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Nov 7, 2013
2 parents 0ceb753 + 52ec889 commit 9ad3f74
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/completion/git-prompt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9ad3f74

Please sign in to comment.