зеркало из https://github.com/microsoft/git.git
Merge branch 'ph/pull-rebase-detached' into maint
"git pull --rebase" run while the HEAD is detached tried to find the upstream branch of the detached HEAD (which by definition does not exist) and emitted unnecessary error messages. * ph/pull-rebase-detached: git-pull: Avoid merge-base on detached head
This commit is contained in:
Коммит
611addf890
|
@ -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")" &&
|
||||||
|
|
Загрузка…
Ссылка в новой задаче