diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-18 23:12:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 23:12:12 (GMT) |
| commit | 0f650e1479c99e21ffb11bb5906a3abe55081a9b (patch) | |
| tree | 80e100f0edef52e3449eec4634e47d041c94c53d /t | |
| parent | cf417e2c1f50578d8f7eccb65b981042d05939f0 (diff) | |
| parent | 965cba2e7ee9b272a35d66a11f0a7bf544aa727a (diff) | |
| download | git-0f650e1479c99e21ffb11bb5906a3abe55081a9b.zip git-0f650e1479c99e21ffb11bb5906a3abe55081a9b.tar.gz git-0f650e1479c99e21ffb11bb5906a3abe55081a9b.tar.bz2 | |
Merge branch 'jk/archive-zip-userdiff-config'
"git archive" did not read the standard configuration files, and
failed to notice a file that is marked as binary via the userdiff
driver configuration.
* jk/archive-zip-userdiff-config:
archive-zip: load userdiff config
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5003-archive-zip.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index 14744b2..55c7870 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -64,6 +64,12 @@ check_zip() { test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf && test_cmp_bin $original/nodiff.lf $extracted/nodiff.lf " + + test_expect_success UNZIP " validate that custom diff is unchanged " " + test_cmp_bin $original/custom.cr $extracted/custom.cr && + test_cmp_bin $original/custom.crlf $extracted/custom.crlf && + test_cmp_bin $original/custom.lf $extracted/custom.lf + " } test_expect_success \ @@ -78,6 +84,9 @@ test_expect_success \ printf "text\r" >a/nodiff.cr && printf "text\r\n" >a/nodiff.crlf && printf "text\n" >a/nodiff.lf && + printf "text\r" >a/custom.cr && + printf "text\r\n" >a/custom.crlf && + printf "text\n" >a/custom.lf && printf "\0\r" >a/binary.cr && printf "\0\r\n" >a/binary.crlf && printf "\0\n" >a/binary.lf && @@ -112,15 +121,20 @@ test_expect_success 'add files to repository' ' test_expect_success 'setup export-subst and diff attributes' ' echo "a/nodiff.* -diff" >>.git/info/attributes && echo "a/diff.* diff" >>.git/info/attributes && + echo "a/custom.* diff=custom" >>.git/info/attributes && + git config diff.custom.binary true && echo "substfile?" export-subst >>.git/info/attributes && git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \ >a/substfile1 ' -test_expect_success \ - 'create bare clone' \ - 'git clone --bare . bare.git && - cp .git/info/attributes bare.git/info/attributes' +test_expect_success 'create bare clone' ' + git clone --bare . bare.git && + cp .git/info/attributes bare.git/info/attributes && + # Recreate our changes to .git/config rather than just copying it, as + # we do not want to clobber core.bare or other settings. + git -C bare.git config diff.custom.binary true +' test_expect_success \ 'remove ignored file' \ |