mirror of
https://github.com/git/git.git
synced 2024-11-01 23:07:55 +01:00
Merge branch 'ph/pull-rebase-detached'
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:
commit
4f101a6cf4
1 changed files with 1 additions and 0 deletions
|
@ -200,6 +200,7 @@ test true = "$rebase" && {
|
|||
require_clean_work_tree "pull with rebase" "Please commit or stash them."
|
||||
fi
|
||||
oldremoteref= &&
|
||||
test -n "$curr_branch" &&
|
||||
. git-parse-remote &&
|
||||
remoteref="$(get_remote_merge_branch "$@" 2>/dev/null)" &&
|
||||
oldremoteref="$(git rev-parse -q --verify "$remoteref")" &&
|
||||
|
|
Loading…
Reference in a new issue