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

diff --git a/git-pull.sh b/git-pull.sh
index 2a10047eb710011213024bd0acc57eec87a6f965..266e682f6c518ab72dc710d52ed4f1dbe22881b5 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -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")" &&