kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-pull: Avoid merge-base on detached head 

git pull --rebase does some clever tricks to find the base
for $upstream, but it forgets that we may not have any
branch at all.  When this happens, git merge-base reports its
"usage" help in the middle of an otherwise successful
rebase operation, because git-merge is called with one too
few parameters.

Since we do not need the merge-base trick in the case of a
detached HEAD, detect this condition and bypass the clever
trick and the usage noise.

Signed-off-by: Phil Hord <hordp@cisco.com>
Signed-off-by: Jeff King <peff@peff.net>
maint
Phil Hord 2012-10-23 16:39:56 -04:00 committed by Jeff King
parent 8c7a786b6c
commit e980765c59
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-pull.sh
View File

@ -200,6 +200,7 @@ test true = "$rebase" && {
require_clean_work_tree "pull with rebase" "Please commit or stash them." require_clean_work_tree "pull with rebase" "Please commit or stash them."
fi fi
oldremoteref= && oldremoteref= &&
test -n "$curr_branch" &&
. git-parse-remote && . git-parse-remote &&
remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" && remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
oldremoteref="$(git rev-parse -q --verify "$remoteref")" && oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&