The original bug will not honor new entries in gitattributes if they are changed in the same checkout as the files they affect. It will also keep using .gitattributes, even if it is deleted in the same commit as the files it affects. --- t/t2013-checkout-crlf.sh | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) create mode 100755 t/t2013-checkout-crlf.sh diff --git a/t/t2013-checkout-crlf.sh b/t/t2013-checkout-crlf.sh new file mode 100755 index 0000000..d9d6465 --- /dev/null +++ b/t/t2013-checkout-crlf.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +test_description='checkout should honor .gitattributes' + +. ./test-lib.sh + +test_expect_success 'setup' ' + + git config core.autocrlf true && + printf ".file2 -crlf\r\n" > .gitattributes && + git add .gitattributes && + git commit -m initial && + printf ".file -crlf\n" >> .gitattributes && + printf "contents\n" > .file && + git add .gitattributes .file && + git commit -m second && + git rm .gitattributes && + printf "contents\r\n" > .file2 && + git add .file2 && + git commit -m third + +' + +test_expect_failure 'checkout with existing .gitattributes' ' + + git checkout master~2 && + git checkout master~1 && + test "$(git diff-files --raw)" = "" + +' + +test_expect_failure 'checkout when deleting .gitattributes' ' + + git checkout master~1 && + git checkout master && + test "$(stat -c %s .file2)" = "10" + +' + +test_done + -- 1.6.1.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
