mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ph/pull-rebase-detached'

Browse Source 
Avoids spewing error messages when using "pull --rebase" on a
detached HEAD.

* ph/pull-rebase-detached:
  git-pull: Avoid merge-base on detached head
This commit is contained in:
Jeff King
2012-11-04 08:00:06 -05:00
parent 6d3f2906a0 e980765c59
commit 4f101a6cf4
1 changed files with 1 additions and 0 deletions
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")" &&