diff options
| author | Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> | 2010-05-19 22:43:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-19 20:36:15 -0700 |
| commit | fd6cce9e89ab5ac1125a3b5f5611048ad22379e7 (patch) | |
| tree | 4c7f3223c70f7153d6f174df1d84345f90b1aaf9 /cache.h | |
| parent | 56499eb9b84453742222676d98e11be3c390c34d (diff) | |
| download | git-fd6cce9e89ab5ac1125a3b5f5611048ad22379e7.tar.gz git-fd6cce9e89ab5ac1125a3b5f5611048ad22379e7.tar.xz | |
Add per-repository eol normalization
Change the semantics of the "crlf" attribute so that it enables
end-of-line normalization when it is set, regardless of "core.autocrlf".
Add a new setting for "crlf": "auto", which enables end-of-line
conversion but does not override the automatic text file detection.
Add a new attribute "eol" with possible values "crlf" and "lf". When
set, this attribute enables normalization and forces git to use CRLF or
LF line endings in the working directory, respectively.
The line ending style to be used for normalized text files in the
working directory is set using "core.autocrlf". When it is set to
"true", CRLFs are used in the working directory; when set to "input" or
"false", LFs are used.
Signed-off-by: Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -535,7 +535,6 @@ extern int core_compression_seen; extern size_t packed_git_window_size; extern size_t packed_git_limit; extern size_t delta_base_cache_limit; -extern int auto_crlf; extern int read_replace_refs; extern int fsync_object_files; extern int core_preload_index; @@ -549,6 +548,14 @@ enum safe_crlf { extern enum safe_crlf safe_crlf; +enum auto_crlf { + AUTO_CRLF_FALSE = 0, + AUTO_CRLF_TRUE = 1, + AUTO_CRLF_INPUT = -1, +}; + +extern enum auto_crlf auto_crlf; + enum branch_track { BRANCH_TRACK_UNSPECIFIED = -1, BRANCH_TRACK_NEVER = 0, |