2007-02-15 01:54:00 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='CRLF conversion'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
q_to_nul () {
|
2007-12-18 01:28:46 +03:00
|
|
|
tr Q '\000'
|
2007-04-20 09:37:19 +04:00
|
|
|
}
|
|
|
|
|
2007-02-15 01:54:00 +03:00
|
|
|
append_cr () {
|
|
|
|
sed -e 's/$/Q/' | tr Q '\015'
|
|
|
|
}
|
|
|
|
|
|
|
|
remove_cr () {
|
|
|
|
tr '\015' Q <"$1" | grep Q >/dev/null &&
|
|
|
|
tr '\015' Q <"$1" | sed -ne 's/Q$//p'
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf false &&
|
2007-02-15 01:54:00 +03:00
|
|
|
|
|
|
|
for w in Hello world how are you; do echo $w; done >one &&
|
|
|
|
mkdir dir &&
|
|
|
|
for w in I am very very fine thank you; do echo $w; done >dir/two &&
|
2007-04-20 09:37:19 +04:00
|
|
|
for w in Oh here is NULQin text here; do echo $w; done | q_to_nul >three &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git add . &&
|
|
|
|
|
|
|
|
git commit -m initial &&
|
|
|
|
|
|
|
|
one=`git rev-parse HEAD:one` &&
|
|
|
|
dir=`git rev-parse HEAD:dir` &&
|
|
|
|
two=`git rev-parse HEAD:dir/two` &&
|
2007-04-20 09:37:19 +04:00
|
|
|
three=`git rev-parse HEAD:three` &&
|
2007-02-15 01:54:00 +03:00
|
|
|
|
|
|
|
for w in Some extra lines here; do echo $w; done >>one &&
|
|
|
|
git diff >patch.file &&
|
|
|
|
patched=`git hash-object --stdin <one` &&
|
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
echo happy.
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'update with autocrlf=input' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf input &&
|
2007-02-15 01:54:00 +03:00
|
|
|
|
|
|
|
for f in one dir/two
|
|
|
|
do
|
|
|
|
append_cr <$f >tmp && mv -f tmp $f &&
|
|
|
|
git update-index -- $f || {
|
|
|
|
echo Oops
|
|
|
|
false
|
|
|
|
break
|
|
|
|
}
|
|
|
|
done &&
|
|
|
|
|
|
|
|
differs=`git diff-index --cached HEAD` &&
|
|
|
|
test -z "$differs" || {
|
|
|
|
echo Oops "$differs"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'update with autocrlf=true' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf true &&
|
2007-02-15 01:54:00 +03:00
|
|
|
|
|
|
|
for f in one dir/two
|
|
|
|
do
|
|
|
|
append_cr <$f >tmp && mv -f tmp $f &&
|
|
|
|
git update-index -- $f || {
|
|
|
|
echo "Oops $f"
|
|
|
|
false
|
|
|
|
break
|
|
|
|
}
|
|
|
|
done &&
|
|
|
|
|
|
|
|
differs=`git diff-index --cached HEAD` &&
|
|
|
|
test -z "$differs" || {
|
|
|
|
echo Oops "$differs"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checkout with autocrlf=true' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf true &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
for f in one dir/two
|
|
|
|
do
|
|
|
|
remove_cr "$f" >tmp && mv -f tmp $f &&
|
|
|
|
git update-index -- $f || {
|
|
|
|
echo "Eh? $f"
|
|
|
|
false
|
|
|
|
break
|
|
|
|
}
|
|
|
|
done &&
|
|
|
|
test "$one" = `git hash-object --stdin <one` &&
|
|
|
|
test "$two" = `git hash-object --stdin <dir/two` &&
|
|
|
|
differs=`git diff-index --cached HEAD` &&
|
|
|
|
test -z "$differs" || {
|
|
|
|
echo Oops "$differs"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checkout with autocrlf=input' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf input &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
for f in one dir/two
|
|
|
|
do
|
|
|
|
if remove_cr "$f" >/dev/null
|
|
|
|
then
|
|
|
|
echo "Eh? $f"
|
|
|
|
false
|
|
|
|
break
|
|
|
|
else
|
|
|
|
git update-index -- $f
|
|
|
|
fi
|
|
|
|
done &&
|
|
|
|
test "$one" = `git hash-object --stdin <one` &&
|
|
|
|
test "$two" = `git hash-object --stdin <dir/two` &&
|
|
|
|
differs=`git diff-index --cached HEAD` &&
|
|
|
|
test -z "$differs" || {
|
|
|
|
echo Oops "$differs"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'apply patch (autocrlf=input)' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf input &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
git apply patch.file &&
|
|
|
|
test "$patched" = "`git hash-object --stdin <one`" || {
|
|
|
|
echo "Eh? apply without index"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'apply patch --cached (autocrlf=input)' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf input &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
git apply --cached patch.file &&
|
|
|
|
test "$patched" = `git rev-parse :one` || {
|
|
|
|
echo "Eh? apply with --cached"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'apply patch --index (autocrlf=input)' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf input &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
git apply --index patch.file &&
|
|
|
|
test "$patched" = `git rev-parse :one` &&
|
|
|
|
test "$patched" = `git hash-object --stdin <one` || {
|
|
|
|
echo "Eh? apply with --index"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'apply patch (autocrlf=true)' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf true &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
git apply patch.file &&
|
2007-02-17 23:37:25 +03:00
|
|
|
test "$patched" = "`remove_cr one | git hash-object --stdin`" || {
|
2007-02-15 01:54:00 +03:00
|
|
|
echo "Eh? apply without index"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'apply patch --cached (autocrlf=true)' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf true &&
|
2007-02-15 01:54:00 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
git apply --cached patch.file &&
|
|
|
|
test "$patched" = `git rev-parse :one` || {
|
|
|
|
echo "Eh? apply without index"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
2007-02-17 23:37:25 +03:00
|
|
|
test_expect_success 'apply patch --index (autocrlf=true)' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf true &&
|
2007-02-17 23:37:25 +03:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
git apply --index patch.file &&
|
|
|
|
test "$patched" = `git rev-parse :one` &&
|
|
|
|
test "$patched" = "`remove_cr one | git hash-object --stdin`" || {
|
|
|
|
echo "Eh? apply with --index"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
2007-04-13 09:30:05 +04:00
|
|
|
test_expect_success '.gitattributes says two is binary' '
|
|
|
|
|
2007-04-20 09:37:19 +04:00
|
|
|
rm -f tmp one dir/two three &&
|
2007-04-16 01:56:09 +04:00
|
|
|
echo "two -crlf" >.gitattributes &&
|
2008-01-18 09:52:40 +03:00
|
|
|
git config core.autocrlf true &&
|
2007-04-13 09:30:05 +04:00
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
if remove_cr dir/two >/dev/null
|
|
|
|
then
|
|
|
|
echo "Huh?"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi &&
|
|
|
|
|
|
|
|
if remove_cr one >/dev/null
|
2007-04-20 09:37:19 +04:00
|
|
|
then
|
|
|
|
: happy
|
|
|
|
else
|
|
|
|
echo "Huh?"
|
|
|
|
false
|
|
|
|
fi &&
|
|
|
|
|
|
|
|
if remove_cr three >/dev/null
|
|
|
|
then
|
|
|
|
echo "Huh?"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '.gitattributes says two is input' '
|
|
|
|
|
|
|
|
rm -f tmp one dir/two three &&
|
|
|
|
echo "two crlf=input" >.gitattributes &&
|
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
if remove_cr dir/two >/dev/null
|
|
|
|
then
|
|
|
|
echo "Huh?"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '.gitattributes says two and three are text' '
|
|
|
|
|
|
|
|
rm -f tmp one dir/two three &&
|
|
|
|
echo "t* crlf" >.gitattributes &&
|
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
if remove_cr dir/two >/dev/null
|
|
|
|
then
|
|
|
|
: happy
|
|
|
|
else
|
|
|
|
echo "Huh?"
|
|
|
|
false
|
|
|
|
fi &&
|
|
|
|
|
|
|
|
if remove_cr three >/dev/null
|
2007-04-13 09:30:05 +04:00
|
|
|
then
|
|
|
|
: happy
|
|
|
|
else
|
|
|
|
echo "Huh?"
|
|
|
|
false
|
|
|
|
fi
|
|
|
|
'
|
|
|
|
|
2007-08-14 12:41:02 +04:00
|
|
|
test_expect_success 'in-tree .gitattributes (1)' '
|
|
|
|
|
|
|
|
echo "one -crlf" >>.gitattributes &&
|
|
|
|
git add .gitattributes &&
|
|
|
|
git commit -m "Add .gitattributes" &&
|
|
|
|
|
|
|
|
rm -rf tmp one dir .gitattributes patch.file three &&
|
|
|
|
git read-tree --reset -u HEAD &&
|
|
|
|
|
|
|
|
if remove_cr one >/dev/null
|
|
|
|
then
|
|
|
|
echo "Eh? one should not have CRLF"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi &&
|
|
|
|
remove_cr three >/dev/null || {
|
|
|
|
echo "Eh? three should still have CRLF"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'in-tree .gitattributes (2)' '
|
|
|
|
|
|
|
|
rm -rf tmp one dir .gitattributes patch.file three &&
|
|
|
|
git read-tree --reset HEAD &&
|
|
|
|
git checkout-index -f -q -u -a &&
|
|
|
|
|
|
|
|
if remove_cr one >/dev/null
|
|
|
|
then
|
|
|
|
echo "Eh? one should not have CRLF"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi &&
|
|
|
|
remove_cr three >/dev/null || {
|
|
|
|
echo "Eh? three should still have CRLF"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'in-tree .gitattributes (3)' '
|
|
|
|
|
|
|
|
rm -rf tmp one dir .gitattributes patch.file three &&
|
|
|
|
git read-tree --reset HEAD &&
|
|
|
|
git checkout-index -u .gitattributes &&
|
|
|
|
git checkout-index -u one dir/two three &&
|
|
|
|
|
|
|
|
if remove_cr one >/dev/null
|
|
|
|
then
|
|
|
|
echo "Eh? one should not have CRLF"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi &&
|
|
|
|
remove_cr three >/dev/null || {
|
|
|
|
echo "Eh? three should still have CRLF"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'in-tree .gitattributes (4)' '
|
|
|
|
|
|
|
|
rm -rf tmp one dir .gitattributes patch.file three &&
|
|
|
|
git read-tree --reset HEAD &&
|
|
|
|
git checkout-index -u one dir/two three &&
|
|
|
|
git checkout-index -u .gitattributes &&
|
|
|
|
|
|
|
|
if remove_cr one >/dev/null
|
|
|
|
then
|
|
|
|
echo "Eh? one should not have CRLF"
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi &&
|
|
|
|
remove_cr three >/dev/null || {
|
|
|
|
echo "Eh? three should still have CRLF"
|
|
|
|
false
|
|
|
|
}
|
|
|
|
'
|
|
|
|
|
2007-10-19 00:02:35 +04:00
|
|
|
test_expect_success 'invalid .gitattributes (must not crash)' '
|
|
|
|
|
|
|
|
echo "three +crlf" >>.gitattributes &&
|
|
|
|
git diff
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-02-15 01:54:00 +03:00
|
|
|
test_done
|