Merge branch 'mm/config-xdg'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Jul 2012 19:56:27 +0000 (12:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jul 2012 19:56:27 +0000 (12:56 -0700)
* mm/config-xdg:
config: fix several access(NULL) calls

1  2 
config.c
diff --combined config.c
index 40818e872ffb61e725d63e0bbf1424ea8987009c,6b97503b06c2e8284590e11acee3efbfa3f5f089..2b706ea2053714fdcec8997d978ce5688d072941
+++ 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;
        }