#392: Strange message "already on master" ----------------------------+----------------------------------------------- Reporter: eschnett | Owner: eric9 Type: defect | Status: review Priority: minor | Milestone: ET_2013_11 Component: GetComponents | Version: Resolution: | Keywords: ----------------------------+----------------------------------------------- Changes (by rhaas):
* status: accepted => review
Comment:
The attached two patches should take of this. Changes are:
* only call checkout if we are not already on the desired branch (HEAD!=branch) * when going back to the current branch, do not try to create it (it already exists since we were on it) and do not reset the local branch to the remote one since this wipes local commits that have not been pushed. If we are not on "branch" the the user did a git checkout manually to switch branches and is likely able to do so again (or rebase) if she wants to do so.
* work around very old git version on queenbee
the attached patches avoid the warning (and do a proper update) on both my workstation (new git) and on queenbee (ancient)