From: Junio C Hamano Date: Sun, 17 Feb 2008 01:59:20 +0000 (-0800) Subject: Merge branch 'sp/safecrlf' X-Git-Tag: v1.5.5-rc0~206 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2ac4b4b2228f3ef996db7b07aea74c4b1a796f38;p=git.git Merge branch 'sp/safecrlf' * sp/safecrlf: safecrlf: Add mechanism to warn about irreversible crlf conversions --- 2ac4b4b2228f3ef996db7b07aea74c4b1a796f38 diff --cc config.c index 7881bbc77,3256c9955..8064cae18 --- a/config.c +++ b/config.c @@@ -415,9 -407,16 +415,18 @@@ int git_default_config(const char *var return 0; } + if (!strcmp(var, "core.safecrlf")) { + if (value && !strcasecmp(value, "warn")) { + safe_crlf = SAFE_CRLF_WARN; + return 0; + } + safe_crlf = git_config_bool(var, value); + return 0; + } + if (!strcmp(var, "user.name")) { + if (!value) + return config_error_nonbool(var); strlcpy(git_default_name, value, sizeof(git_default_name)); return 0; } diff --cc environment.c index fa3633372,e351e99ed..3527f1663 --- a/environment.c +++ b/environment.c @@@ -30,11 -30,12 +30,12 @@@ int core_compression_seen size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE; size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT; size_t delta_base_cache_limit = 16 * 1024 * 1024; -char *pager_program; +const char *pager_program; int pager_use_color = 1; -char *editor_program; -char *excludes_file; +const char *editor_program; +const char *excludes_file; int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */ + enum safe_crlf safe_crlf = SAFE_CRLF_WARN; unsigned whitespace_rule_cfg = WS_DEFAULT_RULE; /* This is set by setup_git_dir_gently() and/or git_default_config() */