Merge branch 'sb/reset-recurse-submodules'

diff --git a/config.c b/config.c
index b4a3205da32faf43db1ab990f08c0bb941af87d0..bb4d735701928d7f648c33ab371c04e3b7af12ad 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1965,7 +1965,7 @@ int git_config_get_expiry(const char *key, const char **output)
        if (ret)
                return ret;
        if (strcmp(*output, "now")) {
-               unsigned long now = approxidate("now");
+               timestamp_t now = approxidate("now");
                if (approxidate(*output) >= now)
                        git_die_config(key, _("Invalid %s: '%s'"), key, *output);
        }