Merge branch 'na/strtoimax' into maint

* na/strtoimax:
  Support sizes >=2G in various config options accepting 'g' sizes.
  Compatibility: declare strtoimax() under NO_STRTOUMAX
  Add strtoimax() compatibility function.

diff --cc Makefile
Simple merge

diff --cc config.c
index b6d789a189713a0259e3f8eb0e29ef657cde66c7,43aa456be1468b5e8be9e4a18675a5ca4cdf70e7..5ea101fb251d27eadac20c665a7f01fb210c20d1
--- 1/config.c
--- 2/config.c
+++ b/config.c
@@@ -330,10 -323,10 +330,10 @@@ static int git_parse_file(config_fn_t f
                if (get_value(fn, data, var, baselen+1) < 0)
                        break;
        }
 -      die("bad config file line %d in %s", config_linenr, config_file_name);
 +      die("bad config file line %d in %s", cf->linenr, cf->name);
  }
  
- static int parse_unit_factor(const char *end, unsigned long *val)
+ static int parse_unit_factor(const char *end, uintmax_t *val)
  {
        if (!*end)
                return 1;

diff --cc git-compat-util.h
Simple merge