2.36 show regression fix

[thirdparty/git.git] / t / t4013-diff-various.sh

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 750aee17ea9650530a5e716020b4ae05ad6c0ef9..7a44d5d5958652d496aed573896239c1225da69e 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -542,6 +542,25 @@ test_expect_success 'diff-tree --stdin with log formatting' '
        test_cmp expect actual
 '
 
+test_expect_success 'show A B ... -- <pathspec>' '
+       # side touches dir/sub, file0, and file3
+       # master^ touches dir/sub, and file1
+       # master^^ touches dir/sub, file0, and file2
+       git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
+       cat >expect <<-\EOF &&
+       <Side>
+
+       dir/sub
+       <Third>
+
+       dir/sub
+       <Second>
+
+       dir/sub
+       EOF
+       test_cmp expect actual
+'
+
 test_expect_success 'diff -I<regex>: setup' '
        git checkout master &&
        test_seq 50 >file0 &&