Merge branch 'sb/pull-rebase'

* sb/pull-rebase:
parse-remote: remove unused functions
parse-remote: support default reflist in get_remote_merge_branch
parse-remote: function to get the tracking branch to be merge

diff --combined git-pull.sh
index cab367ada009659da23774ec303119af3d972038,3cf26634adbc3cb2a7d63b4f03cfac7e8fd96f59..4b78a0cd37ba70236a05f78fb5bed3f763348096
--- 1/git-pull.sh
--- 2/git-pull.sh
+++ b/git-pull.sh
@@@ -125,12 -125,9 +125,9 @@@ test true = "$rebase" && 
        die "refusing to pull with rebase: your working tree is not up-to-date"
  
        . git-parse-remote &&
-       origin="$1"
-       test -z "$origin" && origin=$(get_default_remote)
-       reflist="$(get_remote_refs_for_fetch "$@" 2>/dev/null |
-               sed "s|refs/heads/\(.*\):|\1|")" &&
+       reflist="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
        oldremoteref="$(git rev-parse -q --verify \
-               "refs/remotes/$origin/$reflist")"
+               "$reflist")"
  }
  orig_head=$(git rev-parse -q --verify HEAD)
  git fetch $verbosity --update-head-ok "$@" || exit 1
@@@ -176,11 -173,13 +173,11 @@@ case "$merge_head" i
  ?*' '?*)
        if test -z "$orig_head"
        then
 -              echo >&2 "Cannot merge multiple branches into empty head"
 -              exit 1
 +              die "Cannot merge multiple branches into empty head"
        fi
        if test true = "$rebase"
        then
 -              echo >&2 "Cannot rebase onto multiple branches"
 -              exit 1
 +              die "Cannot rebase onto multiple branches"
        fi
        ;;
  esac