Merge branch 'jc/show-pathspec-fix'
"git show <commit1> <commit2>... -- <pathspec>" lost the pathspec when showing the second and subsequent commits, which has been corrected. * jc/show-pathspec-fix: 2.36 show regression fix
This commit is contained in:
@ -556,6 +556,25 @@ test_expect_success 'diff-tree --stdin with pathspec' '
|
||||
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 &&
|
||||
|
Reference in New Issue
Block a user