Merge branch 'jk/diff-follow-must-take-one-pathspec'