diff options
author | Ramkumar Ramachandra <artagnon@gmail.com> | 2011-11-15 22:29:37 +0530 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-15 16:09:02 -0800 |
commit | 7356b51e4bd07893256d76468d301dc244f4299d (patch) | |
tree | 112abb2c68193dc5ffa50c0eb2eee22ac87ab736 | |
parent | 620771c83ec67c7f066d366acbc2efdfa75e7d14 (diff) | |
download | git-7356b51e4bd07893256d76468d301dc244f4299d.tar.gz |
convert: don't mix enum with int
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | convert.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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); } /***************************************************************** |