From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Dec 2011 23:12:49 +0000 (-0800)
Subject: Merge branch 'na/strtoimax'
X-Git-Tag: v1.7.9-rc0~97
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d6c53bb230b20b4bec8fb462df0031a14f4c995;p=git.git

Merge branch 'na/strtoimax'

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

5d6c53bb230b20b4bec8fb462df0031a14f4c995
diff --cc config.c
index b6d789a18,43aa456be..5ea101fb2
--- a/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;