git-show-branch: tighten merge-base computation.