diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-06-18 16:54:32 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-06-24 13:46:32 -0400 |
| commit | d412165f948b77bf548234fd46fb0743f6afc3ed (patch) | |
| tree | f6a8b3bf4b0d69ba6b744f9f58186faf1a095590 /src/crlf.c | |
| parent | e1fc03c9baea9864dec90d0aef7aadcc2ff20576 (diff) | |
| download | libgit2-d412165f948b77bf548234fd46fb0743f6afc3ed.tar.gz | |
Update text=auto / core.autocrlf=false behavior
Git for Windows 1.9.4 changed the behavior when the text=auto
attribute is specified and core.autocrlf=false. Previous observed
behavior would *not* filter files when going into the working
directory, the new behavior *does* filter. Update our behavior to match.
Diffstat (limited to 'src/crlf.c')
| -rw-r--r-- | src/crlf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/crlf.c b/src/crlf.c index 821e04eb2..93448760d 100644 --- a/src/crlf.c +++ b/src/crlf.c @@ -286,7 +286,8 @@ static int crlf_check( if (error < 0) return error; - if (ca.auto_crlf == GIT_AUTO_CRLF_FALSE) + if (ca.crlf_action == GIT_CRLF_GUESS && + ca.auto_crlf == GIT_AUTO_CRLF_FALSE) return GIT_PASSTHROUGH; if (ca.auto_crlf == GIT_AUTO_CRLF_INPUT && |