From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 04:47:13 +0000 (-0700)
Subject: Merge branch 'sb/pull-rebase'
X-Git-Tag: v1.6.4-rc0~48
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/12d4ffaa94c1379c307cdf489565531c5d6c94fd?hp=-c

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
---

12d4ffaa94c1379c307cdf489565531c5d6c94fd
diff --combined git-pull.sh
index cab367ada0,3cf26634ad..4b78a0cd37
--- a/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