kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t4010: abstract away SHA-1-specific constants 

Adjust the test so that it computes variables for object IDs instead of
using hard-coded hashes.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 2019-10-28 00:58:58 +00:00 committed by Junio C Hamano
parent 440bf91dfa
commit 32a6707267
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
t/t4010-diff-pathspec.sh
View File

@ -17,11 +17,15 @@ test_expect_success \
'echo frotz >file0 && 'echo frotz >file0 &&
mkdir path1 && mkdir path1 &&
echo rezrov >path1/file1 && echo rezrov >path1/file1 &&
before0=$(git hash-object file0) &&
before1=$(git hash-object path1/file1) &&
git update-index --add file0 path1/file1 && git update-index --add file0 path1/file1 &&
tree=$(git write-tree) && tree=$(git write-tree) &&
echo "$tree" && echo "$tree" &&
echo nitfol >file0 && echo nitfol >file0 &&
echo yomin >path1/file1 && echo yomin >path1/file1 &&
after0=$(git hash-object file0) &&
after1=$(git hash-object path1/file1) &&
git update-index file0 path1/file1' git update-index file0 path1/file1'


cat >expected <<\EOF cat >expected <<\EOF
@ -31,32 +35,32 @@ test_expect_success \
'git diff-index --cached $tree -- path >current && 'git diff-index --cached $tree -- path >current &&
compare_diff_raw current expected' compare_diff_raw current expected'


cat >expected <<\EOF cat >expected <<EOF
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 :100644 100644 $before1 $after1 M path1/file1
EOF EOF
test_expect_success \ test_expect_success \
'limit to path1 should show path1/file1' \ 'limit to path1 should show path1/file1' \
'git diff-index --cached $tree -- path1 >current && 'git diff-index --cached $tree -- path1 >current &&
compare_diff_raw current expected' compare_diff_raw current expected'


cat >expected <<\EOF cat >expected <<EOF
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 :100644 100644 $before1 $after1 M path1/file1
EOF EOF
test_expect_success \ test_expect_success \
'limit to path1/ should show path1/file1' \ 'limit to path1/ should show path1/file1' \
'git diff-index --cached $tree -- path1/ >current && 'git diff-index --cached $tree -- path1/ >current &&
compare_diff_raw current expected' compare_diff_raw current expected'


cat >expected <<\EOF cat >expected <<EOF
:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M path1/file1 :100644 100644 $before1 $after1 M path1/file1
EOF EOF
test_expect_success \ test_expect_success \
'"*file1" should show path1/file1' \ '"*file1" should show path1/file1' \
'git diff-index --cached $tree -- "*file1" >current && 'git diff-index --cached $tree -- "*file1" >current &&
compare_diff_raw current expected' compare_diff_raw current expected'


cat >expected <<\EOF cat >expected <<EOF
:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df dca6b92303befc93086aa025d90a5facd7eb2812 M file0 :100644 100644 $before0 $after0 M file0
EOF EOF
test_expect_success \ test_expect_success \
'limit to file0 should show file0' \ 'limit to file0 should show file0' \