diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-21 02:01:37 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-21 13:55:48 +0900 |
| commit | f2fffc17dcc2c93d0fddbec8f655ebfab2a822ec (patch) | |
| tree | a8b21539c572c6766ffc3e2772e82d374bd62281 /t | |
| parent | t4014: abstract away SHA-1-specific constants (diff) | |
| download | tgif-f2fffc17dcc2c93d0fddbec8f655ebfab2a822ec.tar.xz | |
t4020: abstract away SHA-1-specific constants
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4020-diff-external.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index 49d3f54b29..e009826fcb 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -13,6 +13,8 @@ test_expect_success setup ' test_tick && echo second >file && + before=$(git hash-object file) && + before=$(git rev-parse --short $before) && git add file && git commit -m second && @@ -180,9 +182,13 @@ test_expect_success 'no diff with -diff' ' echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file test_expect_success 'force diff with "diff"' ' + after=$(git hash-object file) && + after=$(git rev-parse --short $after) && echo >.gitattributes "file diff" && 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' ' @@ -237,7 +243,7 @@ test_expect_success 'diff --cached' ' git update-index --assume-unchanged file && echo second >file && git diff --cached >actual && - test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual + test_cmp expected-diff actual ' test_expect_success 'clean up crlf leftovers' ' |