git-pickaxe: tighten sanity checks.