Skip to content

Commit 7356b51

Browse files
artagnongitster
authored andcommitted
convert: don't mix enum with int
Signed-off-by: Ramkumar Ramachandra <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 620771c commit 7356b51

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

convert.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
641641
return 1;
642642
}
643643

644-
static int git_path_check_crlf(const char *path, struct git_attr_check *check)
644+
static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_check *check)
645645
{
646646
const char *value = check->value;
647647

@@ -658,7 +658,7 @@ static int git_path_check_crlf(const char *path, struct git_attr_check *check)
658658
return CRLF_GUESS;
659659
}
660660

661-
static int git_path_check_eol(const char *path, struct git_attr_check *check)
661+
static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
662662
{
663663
const char *value = check->value;
664664

@@ -811,7 +811,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str
811811
src = dst->buf;
812812
len = dst->len;
813813
}
814-
return ret | convert_to_git(path, src, len, dst, 0);
814+
return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE);
815815
}
816816

817817
/*****************************************************************

0 commit comments

Comments
 (0)