git-p4: improve client path detection when branches are used