Merge branch 'tr/maint-format-patch-empty-output'

[thirdparty/git.git] / convert.c

diff --git a/convert.c b/convert.c
index 85939c29be67d4179a2afb9069b575afed4d8bb2..416bf83c75510930146dc0e3c2dd3273a9cb4e33 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -727,7 +727,7 @@ static void convert_attrs(struct conv_attrs *ca, const char *path)
                git_config(read_convert_config, NULL);
        }
 
-       if (!git_checkattr(path, NUM_CONV_ATTRS, ccheck)) {
+       if (!git_check_attr(path, NUM_CONV_ATTRS, ccheck)) {
                ca->crlf_action = git_path_check_crlf(path, ccheck + 4);
                if (ca->crlf_action == CRLF_GUESS)
                        ca->crlf_action = git_path_check_crlf(path, ccheck + 0);