Merge branch 'maint'

diff --git a/convert.c b/convert.c
index 13beb70582761f467ea570445afbdabfea7859eb..898bfe3eb219618e746afbe02eb4a8756eccc6aa 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -140,7 +140,7 @@ int convert_to_working_tree(const char *path, char **bufp, unsigned long *sizep)
         * based on filename patterns. Right now we just do the
         * stupid auto-CRLF one.
         */
-       if (!auto_crlf)
+       if (auto_crlf <= 0)
                return 0;
 
        size = *sizep;