git-pull: Avoid merge-base on detached head
git pull --rebase does some clever tricks to find the base for $upstream, but it forgets that we may not have any branch at all. When this happens, git merge-base reports its "usage" help in the middle of an otherwise successful rebase operation, because git-merge is called with one too few parameters. Since we do not need the merge-base trick in the case of a detached HEAD, detect this condition and bypass the clever trick and the usage noise. Signed-off-by: NPhil Hord <hordp@cisco.com> Signed-off-by: NJeff King <peff@peff.net>
Showing
想要评论请 注册 或 登录