Merge branch 'jn/clean-use-error-not-fprintf-on-stderr'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:52 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:53 +0000 (14:23 -0700)
Some error messages in "git config" were emitted without calling
the usual error() facility.

* jn/clean-use-error-not-fprintf-on-stderr:
config: use error() instead of fprintf(stderr, ...)

1  2 
builtin/config.c
diff --combined builtin/config.c
index bfd3016e83f3fd4e5f4f2ec8f4d6f4c5a24e711f,89f32088f7abd2b93a46a07e9fe63f2afd7066d4..28f57c8fb96c61151042a670ee70722eb8ead143
@@@ -193,7 -193,7 +193,7 @@@ static int get_value(const char *key_, 
  
                key_regexp = (regex_t*)xmalloc(sizeof(regex_t));
                if (regcomp(key_regexp, key, REG_EXTENDED)) {
-                       fprintf(stderr, "Invalid key pattern: %s\n", key_);
+                       error("invalid key pattern: %s", key_);
                        free(key_regexp);
                        key_regexp = NULL;
                        ret = CONFIG_INVALID_PATTERN;
  
                regexp = (regex_t*)xmalloc(sizeof(regex_t));
                if (regcomp(regexp, regex_, REG_EXTENDED)) {
-                       fprintf(stderr, "Invalid pattern: %s\n", regex_);
+                       error("invalid pattern: %s", regex_);
                        free(regexp);
                        regexp = NULL;
                        ret = CONFIG_INVALID_PATTERN;
@@@ -455,9 -455,9 +455,9 @@@ static char *default_user_config(void
        struct strbuf buf = STRBUF_INIT;
        strbuf_addf(&buf,
                    _("# This is Git's per-user configuration file.\n"
 -                    "[core]\n"
 +                    "[user]\n"
                      "# Please adapt and uncomment the following lines:\n"
 -                    "#        user = %s\n"
 +                    "#        name = %s\n"
                      "#        email = %s\n"),
                    ident_default_name(),
                    ident_default_email());