]> git.ipfire.org Git - thirdparty/git.git/commitdiff
convert: drop unused crlf_action from check_global_conv_flags_eol()
authorJeff King <peff@peff.net>
Wed, 30 Sep 2020 12:27:53 +0000 (08:27 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Sep 2020 19:53:47 +0000 (12:53 -0700)
The crlf_action parameter hasn't been used since a0ad53c181 (convert:
Correct NNO tests and missing `LF will be replaced by CRLF`,
2016-08-13), where that part of the function was hoisted out to a
separate will_convert_lf_to_crlf() helper. Let's drop the useless
parameter.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
convert.c

index 8e6c2924215a4ee754658cbc9008856845fc071c..ee360c2f07ced0daa8f3f7b1b651fae7c245cb26 100644 (file)
--- 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;