Skip to content

G
git2
Commit 99ec4fdb by Edward Thomson
Options

crlf: wrap line

parent 2ad24a4e
Showing with 4 additions and 2 deletions
src/crlf.c
...@@ -306,7 +306,8 @@ static int crlf_check( ...@@ -306,7 +306,8 @@ static int crlf_check(
return GIT_PASSTHROUGH; return GIT_PASSTHROUGH;
if (ca.crlf_action == GIT_CRLF_GUESS || if (ca.crlf_action == GIT_CRLF_GUESS ||
((ca.crlf_action == GIT_CRLF_AUTO || ca.crlf_action == GIT_CRLF_TEXT) && ((ca.crlf_action == GIT_CRLF_AUTO ||
ca.crlf_action == GIT_CRLF_TEXT) &&
git_filter_source_mode(src) == GIT_FILTER_SMUDGE)) { git_filter_source_mode(src) == GIT_FILTER_SMUDGE)) {
error = git_repository__cvar( error = git_repository__cvar(
...@@ -318,7 +319,8 @@ static int crlf_check( ...@@ -318,7 +319,8 @@ static int crlf_check(
ca.auto_crlf == GIT_AUTO_CRLF_FALSE) ca.auto_crlf == GIT_AUTO_CRLF_FALSE)
return GIT_PASSTHROUGH; return GIT_PASSTHROUGH;
if (ca.auto_crlf == GIT_AUTO_CRLF_INPUT && ca.eol != GIT_EOL_CRLF && if (ca.auto_crlf == GIT_AUTO_CRLF_INPUT &&
ca.eol != GIT_EOL_CRLF &&
git_filter_source_mode(src) == GIT_FILTER_SMUDGE) git_filter_source_mode(src) == GIT_FILTER_SMUDGE)
return GIT_PASSTHROUGH; return GIT_PASSTHROUGH;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment