(master) fixed bug with set upstream potentially tracking the wrong branch because none was specified