Yeah, I think the proper fix is to do a fetch of the `origin` repo, followed by a checkout.

I'll try what I'm proposing here and let you guys know about it.