undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ph/pull-rebase-detached' into maint

Browse Source 
"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:
Junio C Hamano 2012-11-18 19:33:45 -08:00
commit 611addf890
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")" &&