lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

track: use default line endings for core.autocrlf=input

Browse Source 
We currently use core.autocrlf to guess what line endings a user might
want to have for the .gitattributes file if it lacks line endings
already. When the user has specified core.autocrlf=input, they have
specified that they don't want line endings to be changed. This isn't
explicitly an indication that they want to use CRLF line endings,
especially if they are on a non-Windows system.

Therefore, if we need to guess what line endings to use with
core.autocrlf=input, guess the system line endings, not CRLF.
This commit is contained in:
brian m. carlson 2019-07-15 20:55:24 +00:00
parent b37a750104
commit 226f5bb092
No known key found for this signature in database
GPG Key ID: 2D0C9BC12F82B3A1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/path.go
View File

@ -5,7 +5,7 @@ import "strings"
func gitLineEnding(git env) string {
value, _ := git.Get("core.autocrlf")
switch strings.ToLower(value) {
case "input", "true", "t", "1":
case "true", "t", "1":
return "\r\n"
default:
return osLineEnding()

9
t/t-track.sh
View File

@ -212,9 +212,12 @@ begin_test "track with autocrlf=input"
[ "*.mov filter=lfs -text" = "$(cat .gitattributes)" ]
git lfs track "*.gif"
expected="*.mov filter=lfs -text^M$
*.gif filter=lfs diff=lfs merge=lfs -text^M$"
[ "$expected" = "$(cat -e .gitattributes)" ]
if [ $IS_WINDOWS -eq 1 ]
then
cat -e .gitattributes | grep '\^M\$'
else
cat -e .gitattributes | grep -v '\^M'
fi
)
end_test