From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jul 2012 19:56:27 +0000 (-0700)
Subject: Merge branch 'mm/config-xdg'
X-Git-Tag: v1.7.12-rc0~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a3ad9a0f8d57cb0c98adc541ea1de1cc1081cf14?ds=inline;hp=-c

Merge branch 'mm/config-xdg'

* mm/config-xdg:
config: fix several access(NULL) calls
---

a3ad9a0f8d57cb0c98adc541ea1de1cc1081cf14
diff --combined config.c
index 40818e872f,6b97503b06..2b706ea205
--- a/config.c
+++ b/config.c
@@@ -758,11 -758,6 +758,11 @@@ static int git_default_core_config(cons
  		return 0;
  	}
  
 +	if (!strcmp(var, "core.precomposeunicode")) {
 +		precomposed_unicode = git_config_bool(var, value);
 +		return 0;
 +	}
 +
  	/* Add other config variables here and to Documentation/config.txt. */
  	return 0;
  }
@@@ -945,12 -940,12 +945,12 @@@ int git_config_early(config_fn_t fn, vo
  		found += 1;
  	}
  
- 	if (!access(xdg_config, R_OK)) {
+ 	if (xdg_config && !access(xdg_config, R_OK)) {
  		ret += git_config_from_file(fn, xdg_config, data);
  		found += 1;
  	}
  
- 	if (!access(user_config, R_OK)) {
+ 	if (user_config && !access(user_config, R_OK)) {
  		ret += git_config_from_file(fn, user_config, data);
  		found += 1;
  	}