X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=convert.c;h=ee360c2f07ced0daa8f3f7b1b651fae7c245cb26;hb=d5e35329dd5305d611478e8d5076a8ca75e25f0d;hp=8e6c2924215a4ee754658cbc9008856845fc071c;hpb=ed9d8331d25eae29aa24a2859bde6450aebe0bc3;p=thirdparty%2Fgit.git diff --git a/convert.c b/convert.c index 8e6c292421..ee360c2f07 100644 --- a/convert.c +++ b/convert.c @@ -195,7 +195,7 @@ static enum eol output_eol(enum crlf_action crlf_action) return core_eol; } -static void check_global_conv_flags_eol(const char *path, enum crlf_action crlf_action, +static void check_global_conv_flags_eol(const char *path, struct text_stat *old_stats, struct text_stat *new_stats, int conv_flags) { @@ -547,7 +547,7 @@ static int crlf_to_git(const struct index_state *istate, new_stats.crlf += new_stats.lonelf; new_stats.lonelf = 0; } - check_global_conv_flags_eol(path, crlf_action, &stats, &new_stats, conv_flags); + check_global_conv_flags_eol(path, &stats, &new_stats, conv_flags); } if (!convert_crlf_into_lf) return 0;