mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/eol-on-ourselves' into maint
Make sure our tests would pass when the sources are checked out with "platform native" line ending convention by default on Windows. Some "text" files out tests use and the test scripts themselves that are meant to be run with /bin/sh, ought to be checked out with eol=LF even on Windows. * js/eol-on-ourselves: t4051: mark supporting files as requiring LF-only line endings Fix the remaining tests that failed with core.autocrlf=true t3901: move supporting files into t/t3901/ completion: mark bash script as LF-only git-new-workdir: mark script as LF-only Fix build with core.autocrlf=true
This commit is contained in:
commit
7ba4fa5c08
8
.gitattributes
vendored
8
.gitattributes
vendored
|
@ -1,3 +1,9 @@
|
|||
* whitespace=!indent,trail,space
|
||||
*.[ch] whitespace=indent,trail,space diff=cpp
|
||||
*.sh whitespace=indent,trail,space
|
||||
*.sh whitespace=indent,trail,space eol=lf
|
||||
*.perl eol=lf
|
||||
*.pm eol=lf
|
||||
/Documentation/git-*.txt eol=lf
|
||||
/command-list.txt eol=lf
|
||||
/GIT-VERSION-GEN eol=lf
|
||||
/mergetools/* eol=lf
|
||||
|
|
1
contrib/completion/.gitattributes
vendored
Normal file
1
contrib/completion/.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
*.bash eol=lf
|
1
contrib/workdir/.gitattributes
vendored
Normal file
1
contrib/workdir/.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
/git-new-workdir eol=lf
|
1
git-gui/.gitattributes
vendored
1
git-gui/.gitattributes
vendored
|
@ -2,3 +2,4 @@
|
|||
* encoding=US-ASCII
|
||||
git-gui.sh encoding=UTF-8
|
||||
/po/*.po encoding=UTF-8
|
||||
/GIT-VERSION-GEN eol=lf
|
||||
|
|
22
t/.gitattributes
vendored
22
t/.gitattributes
vendored
|
@ -1,2 +1,22 @@
|
|||
t[0-9][0-9][0-9][0-9]/* -whitespace
|
||||
t0110/url-* binary
|
||||
/diff-lib/* eol=lf
|
||||
/t0110/url-* binary
|
||||
/t3900/*.txt eol=lf
|
||||
/t3901/*.txt eol=lf
|
||||
/t4034/*/* eol=lf
|
||||
/t4013/* eol=lf
|
||||
/t4018/* eol=lf
|
||||
/t4051/* eol=lf
|
||||
/t4100/* eol=lf
|
||||
/t4101/* eol=lf
|
||||
/t4109/* eol=lf
|
||||
/t4110/* eol=lf
|
||||
/t4135/* eol=lf
|
||||
/t4211/* eol=lf
|
||||
/t4252/* eol=lf
|
||||
/t5100/* eol=lf
|
||||
/t5515/* eol=lf
|
||||
/t556x_common eol=lf
|
||||
/t7500/* eol=lf
|
||||
/t8005/*.txt eol=lf
|
||||
/t9*/*.dump eol=lf
|
||||
|
|
|
@ -8,7 +8,7 @@ test_description="The Git C functions aren't broken by setlocale(3)"
|
|||
. ./lib-gettext.sh
|
||||
|
||||
test_expect_success 'git show a ISO-8859-1 commit under C locale' '
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
test_commit "iso-c-commit" iso-under-c &&
|
||||
git show >out 2>err &&
|
||||
! test -s err &&
|
||||
|
@ -16,7 +16,7 @@ test_expect_success 'git show a ISO-8859-1 commit under C locale' '
|
|||
'
|
||||
|
||||
test_expect_success GETTEXT_LOCALE 'git show a ISO-8859-1 commit under a UTF-8 locale' '
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
test_commit "iso-utf8-commit" iso-under-utf8 &&
|
||||
LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err &&
|
||||
! test -s err &&
|
||||
|
|
|
@ -31,7 +31,7 @@ test_expect_success setup '
|
|||
|
||||
# use UTF-8 in author and committer name to match the
|
||||
# i18n.commitencoding settings
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
|
||||
test_tick &&
|
||||
echo "$GIT_AUTHOR_NAME" >mine &&
|
||||
|
@ -55,7 +55,7 @@ test_expect_success setup '
|
|||
# the second one on the side branch is ISO-8859-1
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
# use author and committer name in ISO-8859-1 to match it.
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt
|
||||
fi &&
|
||||
test_tick &&
|
||||
echo Yet another >theirs &&
|
||||
|
@ -100,7 +100,7 @@ test_expect_success 'rebase (U/U)' '
|
|||
|
||||
# The result will be committed by GIT_COMMITTER_NAME --
|
||||
# we want UTF-8 encoded name.
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
git checkout -b test &&
|
||||
git rebase master &&
|
||||
|
||||
|
@ -110,7 +110,7 @@ test_expect_success 'rebase (U/U)' '
|
|||
test_expect_success 'rebase (U/L)' '
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
git config i18n.logoutputencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
|
||||
git reset --hard side &&
|
||||
git rebase master &&
|
||||
|
@ -122,7 +122,7 @@ test_expect_success !MINGW 'rebase (L/L)' '
|
|||
# In this test we want ISO-8859-1 encoded commits as the result
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
git config i18n.logoutputencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
|
||||
git reset --hard side &&
|
||||
git rebase master &&
|
||||
|
@ -135,7 +135,7 @@ test_expect_success !MINGW 'rebase (L/U)' '
|
|||
# to get ISO-8859-1 results.
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
git config i18n.logoutputencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
|
||||
git reset --hard side &&
|
||||
git rebase master &&
|
||||
|
@ -148,7 +148,7 @@ test_expect_success 'cherry-pick(U/U)' '
|
|||
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
git config i18n.logoutputencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git cherry-pick side^ &&
|
||||
|
@ -163,7 +163,7 @@ test_expect_success !MINGW 'cherry-pick(L/L)' '
|
|||
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
git config i18n.logoutputencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git cherry-pick side^ &&
|
||||
|
@ -178,7 +178,7 @@ test_expect_success 'cherry-pick(U/L)' '
|
|||
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
git config i18n.logoutputencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git cherry-pick side^ &&
|
||||
|
@ -194,7 +194,7 @@ test_expect_success !MINGW 'cherry-pick(L/U)' '
|
|||
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
git config i18n.logoutputencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git cherry-pick side^ &&
|
||||
|
@ -207,7 +207,7 @@ test_expect_success !MINGW 'cherry-pick(L/U)' '
|
|||
test_expect_success 'rebase --merge (U/U)' '
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
git config i18n.logoutputencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
|
||||
git reset --hard side &&
|
||||
git rebase --merge master &&
|
||||
|
@ -218,7 +218,7 @@ test_expect_success 'rebase --merge (U/U)' '
|
|||
test_expect_success 'rebase --merge (U/L)' '
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
git config i18n.logoutputencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
|
||||
git reset --hard side &&
|
||||
git rebase --merge master &&
|
||||
|
@ -230,7 +230,7 @@ test_expect_success 'rebase --merge (L/L)' '
|
|||
# In this test we want ISO-8859-1 encoded commits as the result
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
git config i18n.logoutputencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
|
||||
git reset --hard side &&
|
||||
git rebase --merge master &&
|
||||
|
@ -243,7 +243,7 @@ test_expect_success 'rebase --merge (L/U)' '
|
|||
# to get ISO-8859-1 results.
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
git config i18n.logoutputencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
|
||||
git reset --hard side &&
|
||||
git rebase --merge master &&
|
||||
|
@ -254,7 +254,7 @@ test_expect_success 'rebase --merge (L/U)' '
|
|||
test_expect_success 'am (U/U)' '
|
||||
# Apply UTF-8 patches with UTF-8 commitencoding
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git am out-u1 out-u2 &&
|
||||
|
@ -265,7 +265,7 @@ test_expect_success 'am (U/U)' '
|
|||
test_expect_success !MINGW 'am (L/L)' '
|
||||
# Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git am out-l1 out-l2 &&
|
||||
|
@ -276,7 +276,7 @@ test_expect_success !MINGW 'am (L/L)' '
|
|||
test_expect_success 'am (U/L)' '
|
||||
# Apply ISO-8859-1 patches with UTF-8 commitencoding
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
git reset --hard master &&
|
||||
|
||||
# am specifies --utf8 by default.
|
||||
|
@ -288,7 +288,7 @@ test_expect_success 'am (U/L)' '
|
|||
test_expect_success 'am --no-utf8 (U/L)' '
|
||||
# Apply ISO-8859-1 patches with UTF-8 commitencoding
|
||||
git config i18n.commitencoding UTF-8 &&
|
||||
. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
git am --no-utf8 out-l1 out-l2 2>err &&
|
||||
|
@ -303,7 +303,7 @@ test_expect_success 'am --no-utf8 (U/L)' '
|
|||
test_expect_success !MINGW 'am (L/U)' '
|
||||
# Apply UTF-8 patches with ISO-8859-1 commitencoding
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
|
||||
git reset --hard master &&
|
||||
# mailinfo will re-code the commit message to the charset specified by
|
||||
|
|
|
@ -70,7 +70,7 @@ test_expect_success 'iso-8859-1' '
|
|||
|
||||
git config i18n.commitencoding ISO8859-1 &&
|
||||
# use author and committer name in ISO-8859-1 to match it.
|
||||
. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
test_tick &&
|
||||
echo rosten >file &&
|
||||
git commit -s -m den file &&
|
||||
|
|
|
@ -519,7 +519,7 @@ test_expect_success \
|
|||
|
||||
test_expect_success \
|
||||
'encode(commit): utf8' \
|
||||
'. "$TEST_DIRECTORY"/t3901-utf8.txt &&
|
||||
'. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
||||
test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
|
||||
test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
|
||||
echo "UTF-8" >> file &&
|
||||
|
@ -529,7 +529,7 @@ test_expect_success \
|
|||
|
||||
test_expect_success \
|
||||
'encode(commit): iso-8859-1' \
|
||||
'. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
|
||||
'. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
||||
test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
|
||||
test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
|
||||
echo "ISO-8859-1" >> file &&
|
||||
|
|
Loading…
Reference in a new issue