diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-05-30 11:30:53 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-05-30 11:30:53 -0500 |
| commit | 49837fd49fb9de999be5add82a12bf6332d4703f (patch) | |
| tree | 027d837aaa0b84a864af1d663d152a01c1747e94 /src/config_cache.c | |
| parent | 58eea5ebf40b698cbaf028b23ee6157d5eb6582c (diff) | |
| download | libgit2-49837fd49fb9de999be5add82a12bf6332d4703f.tar.gz | |
Ignore core.safecrlf=warn until we have a warn infrastructure
Diffstat (limited to 'src/config_cache.c')
| -rw-r--r-- | src/config_cache.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/config_cache.c b/src/config_cache.c index dca9976f8..45c39ce17 100644 --- a/src/config_cache.c +++ b/src/config_cache.c @@ -51,6 +51,12 @@ static git_cvar_map _cvar_map_autocrlf[] = { {GIT_CVAR_STRING, "input", GIT_AUTO_CRLF_INPUT} }; +static git_cvar_map _cvar_map_safecrlf[] = { + {GIT_CVAR_FALSE, NULL, GIT_SAFE_CRLF_FALSE}, + {GIT_CVAR_TRUE, NULL, GIT_SAFE_CRLF_FAIL}, + {GIT_CVAR_STRING, "warn", GIT_SAFE_CRLF_WARN} +}; + /* * Generic map for integer values */ @@ -68,7 +74,7 @@ static struct map_data _cvar_maps[] = { {"core.trustctime", NULL, 0, GIT_TRUSTCTIME_DEFAULT }, {"core.abbrev", _cvar_map_int, 1, GIT_ABBREV_DEFAULT }, {"core.precomposeunicode", NULL, 0, GIT_PRECOMPOSE_DEFAULT }, - {"core.safecrlf", NULL, 0, GIT_SAFE_CRLF_DEFAULT}, + {"core.safecrlf", _cvar_map_safecrlf, ARRAY_SIZE(_cvar_map_safecrlf), GIT_SAFE_CRLF_DEFAULT}, {"core.logallrefupdates", NULL, 0, GIT_LOGALLREFUPDATES_DEFAULT }, }; |