summaryrefslogtreecommitdiff
path: root/convert.h
diff options
context:
space:
mode:
authorTorsten Bögershausen <tboegi@web.de>2017-08-13 08:51:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-16 17:21:17 (GMT)
commit2fea9de61857986431982ae89c01c89a2fc10038 (patch)
treefb99259a2d520ddeafd90022a52cc696b24234fc /convert.h
parent4d7268b888d7bb6d675340ec676e4239739d0f6d (diff)
downloadgit-2fea9de61857986431982ae89c01c89a2fc10038.zip
git-2fea9de61857986431982ae89c01c89a2fc10038.tar.gz
git-2fea9de61857986431982ae89c01c89a2fc10038.tar.bz2
convert: add SAFE_CRLF_KEEP_CRLF
When convert_to_git() is called, the caller may want to keep CRLF to be kept as CRLF (and not converted into LF). This will be used in the next commit, when apply works with files that have CRLF and patches are applied onto these files. Add the new value "SAFE_CRLF_KEEP_CRLF" to safe_crlf. Prepare convert_to_git() to be able to run the clean filter, skip the CRLF conversion and run the ident filter. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.h')
-rw-r--r--convert.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/convert.h b/convert.h
index cecf59d..cabd5ed 100644
--- a/convert.h
+++ b/convert.h
@@ -10,7 +10,8 @@ enum safe_crlf {
SAFE_CRLF_FALSE = 0,
SAFE_CRLF_FAIL = 1,
SAFE_CRLF_WARN = 2,
- SAFE_CRLF_RENORMALIZE = 3
+ SAFE_CRLF_RENORMALIZE = 3,
+ SAFE_CRLF_KEEP_CRLF = 4
};
extern enum safe_crlf safe_crlf;