Merge branch 'jc/show-pathspec-fix' into maint