undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4020: abstract away SHA-1-specific constants

Browse Source 
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2018-05-21 02:01:37 +00:00 committed by Junio C Hamano
parent bdee9cd6c1
commit f2fffc17dc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t4020-diff-external.sh
View File

@ -13,6 +13,8 @@ test_expect_success setup '
test_tick && test_tick &&
echo second >file && echo second >file &&
before=$(git hash-object file) &&
before=$(git rev-parse --short $before) &&
git add file && git add file &&
git commit -m second && git commit -m second &&
@ -180,9 +182,13 @@ test_expect_success 'no diff with -diff' '
echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
test_expect_success 'force diff with "diff"' ' test_expect_success 'force diff with "diff"' '
after=$(git hash-object file) &&
after=$(git rev-parse --short $after) &&
echo >.gitattributes "file diff" && echo >.gitattributes "file diff" &&
git diff >actual && git diff >actual &&
test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual sed -e "s/^index .*/index $before..$after 100644/" \
"$TEST_DIRECTORY"/t4020/diff.NUL >expected-diff &&
test_cmp expected-diff actual
' '
test_expect_success 'GIT_EXTERNAL_DIFF with more than one changed files' ' test_expect_success 'GIT_EXTERNAL_DIFF with more than one changed files' '
@ -237,7 +243,7 @@ test_expect_success 'diff --cached' '
git update-index --assume-unchanged file && git update-index --assume-unchanged file &&
echo second >file && echo second >file &&
git diff --cached >actual && git diff --cached >actual &&
test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual test_cmp expected-diff actual
' '
test_expect_success 'clean up crlf leftovers' ' test_expect_success 'clean up crlf leftovers' '