From 7356b51e4bd07893256d76468d301dc244f4299d Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Tue, 15 Nov 2011 22:29:37 +0530 Subject: [PATCH] convert: don't mix enum with int Signed-off-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano --- convert.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/convert.c b/convert.c index 3bb5a4dd57..038b0be617 100644 --- a/convert.c +++ b/convert.c @@ -641,7 +641,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len, return 1; } -static int git_path_check_crlf(const char *path, struct git_attr_check *check) +static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_check *check) { const char *value = check->value; @@ -658,7 +658,7 @@ static int git_path_check_crlf(const char *path, struct git_attr_check *check) return CRLF_GUESS; } -static int git_path_check_eol(const char *path, struct git_attr_check *check) +static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check) { const char *value = check->value; @@ -811,7 +811,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str src = dst->buf; len = dst->len; } - return ret | convert_to_git(path, src, len, dst, 0); + return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE); } /***************************************************************** -- 2.11.4.GIT