Sorry, that should read "How about calling ensure_current_master unless we're on a non-master branch"