Branch not properly guessed when updating master

[FMCorz]

Say your current stable_master is on 2.5, but we just released a new version and so masterBranch is set to 26. Then running mdk update on stable_master will not reset to the master branch but to origin/MOODLE_25_STABLE.

This is seen as a bug from the user, but that is caused by the version.php file still displaying branch = 25. A manual git reset on the master branch will fix the issue.

Not sure how to fix this, or how to prompt the user for the right action.

[danpoltawski]

I think I experienced this too.

[FMCorz]

Quick fix (on v0.4):

cd /your/master/instance
git checkout master
mdk update -c
git reset --hard origin/master
mdk update --upgrade

[FMCorz]

I didn't experience this issue during the transition from 2.6 to 2.7 (master). Not sure why.

[danpoltawski]

Same.

[FMCorz]

This must also depends on the status of the branches checked out during update/upgrade. They should be rebased.