Skip to content

Commit

Permalink
Merge branch 'ph/pull-rebase-detached'
Browse files Browse the repository at this point in the history
Avoids spewing error messages when using "pull --rebase" on a
detached HEAD.

* ph/pull-rebase-detached:
  git-pull: Avoid merge-base on detached head
  • Loading branch information
Jeff King committed Nov 4, 2012
2 parents 6d3f290 + e980765 commit 4f101a6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")" &&
Expand Down

0 comments on commit 4f101a6

Please sign in to comment.