completion: handle unstuck form of base git options