Merge branch 'maint'

* maint:
  parse-remote: typofix

diff --cc git-parse-remote.sh
index 91688792a2eb28d6f6a84fae81f1ae390bd49b45,9b950be28d75b173ed81d5cf83271e9a8c4e6dff..ea093d251d98af6a3d4df19e900d56df34d51572
--- 1/git-parse-remote.sh
--- 2/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@@ -4,9 -4,59 +4,9 @@@
  # this would fail in that case and would issue an error message.
  GIT_DIR=$(git rev-parse -q --git-dir) || :;
  
 -get_data_source () {
 -      case "$1" in
 -      */*)
 -              echo ''
 -              ;;
 -      .)
 -              echo self
 -              ;;
 -      *)
 -              if test "$(git config --get "remote.$1.url")"
 -              then
 -                      echo config
 -              elif test -f "$GIT_DIR/remotes/$1"
 -              then
 -                      echo remotes
 -              elif test -f "$GIT_DIR/branches/$1"
 -              then
 -                      echo branches
 -              else
 -                      echo ''
 -              fi ;;
 -      esac
 -}
 -
 -get_remote_url () {
 -      data_source=$(get_data_source "$1")
 -      case "$data_source" in
 -      '')
 -              echo "$1"
 -              ;;
 -      self)
 -              echo "$1"
 -              ;;
 -      config)
 -              git config --get "remote.$1.url"
 -              ;;
 -      remotes)
 -              sed -ne '/^URL: */{
 -                      s///p
 -                      q
 -              }' "$GIT_DIR/remotes/$1"
 -              ;;
 -      branches)
 -              sed -e 's/#.*//' "$GIT_DIR/branches/$1"
 -              ;;
 -      *)
 -              die "internal error: get-remote-url $1" ;;
 -      esac
 -}
 -
  get_default_remote () {
        curr_branch=$(git symbolic-ref -q HEAD)
-       curr_branch="${cur_branch#refs/heads/}"
+       curr_branch="${curr_branch#refs/heads/}"
        origin=$(git config --get "branch.$curr_branch.remote")
        echo ${origin:-origin}
  }