development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tb/doc-eol-normalization'

Browse source 
Doc update.

* tb/doc-eol-normalization:
  gitattributes.txt: document how to normalize the line endings
This commit is contained in:
Junio C Hamano 2017-04-23 22:07:44 -07:00
parent 6b51cb6181 85999743e7
commit 848d9a9bb7
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/gitattributes.txt
View file

@ -229,11 +229,9 @@ From a clean working directory:
-------------------------------------------------
$ echo "* text=auto" >.gitattributes
$ rm .git/index # Remove the index to force Git to
$ git reset # re-scan the working directory
$ rm .git/index # Remove the index to re-scan the working directory
$ git add .
$ git status # Show files that will be normalized
$ git add -u
$ git add .gitattributes
$ git commit -m "Introduce end-of-line normalization"
-------------------------------------------------

26
t/t0025-crlf-auto.sh
View file

@ -152,4 +152,30 @@ test_expect_success 'eol=crlf _does_ normalize binary files' '
test -z "$LFwithNULdiff"
'
test_expect_success 'prepare unnormalized' '
> .gitattributes &&
git config core.autocrlf false &&
printf "LINEONE\nLINETWO\r\n" >mixed &&
git add mixed .gitattributes &&
git commit -m "Add mixed" &&
git ls-files --eol | egrep "i/crlf" &&
git ls-files --eol | egrep "i/mixed"
'
test_expect_success 'normalize unnormalized' '
echo "* text=auto" >.gitattributes &&
rm .git/index &&
git add . &&
git commit -m "Introduce end-of-line normalization" &&
git ls-files --eol | tr "\\t" " " | sort >act &&
cat >exp <<EOF &&
i/-text w/-text attr/text=auto LFwithNUL
i/lf w/crlf attr/text=auto CRLFonly
i/lf w/crlf attr/text=auto LFonly
i/lf w/lf attr/text=auto .gitattributes
i/lf w/mixed attr/text=auto mixed
EOF
test_cmp exp act
'
test_done