Merge branch 'kh/pathspec-error-wo-repository-fix'