Merge branch 'maint-1.6.0' into maint

diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index 9322298ecc6cb79f0123dea4e329317c5bfbfd11..94df7ae53a0ef47c0ef10ca6b3215ffdf38fa399 100755 (executable)
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -62,4 +62,12 @@ test_expect_success \
     'git diff-index --cached $tree -- file0/ >current &&
      compare_diff_raw current expected'
 
+test_expect_success 'diff-tree pathspec' '
+       tree2=$(git write-tree) &&
+       echo "$tree2" &&
+       git diff-tree -r --name-only $tree $tree2 -- pa path1/a >current &&
+       >expected &&
+       test_cmp expected current
+'
+
 test_done