Merge branch 'ao/p4-d-f-conflict-recover'

[thirdparty/git.git] / convert.c

diff --git a/convert.c b/convert.c
index 5aa87d45e3e5a03b7530fcc36d8a71581250f446..572449825c5a4c8fd1ff65bb0c947d0c567d002b 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -1018,7 +1018,7 @@ static int apply_filter(const char *path, const char *src, size_t len,
 static int read_convert_config(const char *var, const char *value, void *cb)
 {
        const char *key, *name;
-       int namelen;
+       size_t namelen;
        struct convert_driver *drv;
 
        /*