git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>,
	Git Mailing List <git@vger.kernel.org>
Cc: Denis Bueno <dbueno@gmail.com>
Subject: [PATCH 2/4] Split up default "user" config parsing into helper routine
Date: Wed, 18 Jun 2008 15:31:08 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LFD.1.10.0806181530420.2907@woody.linux-foundation.org> (raw)
In-Reply-To: <alpine.LFD.1.10.0806181529570.2907@woody.linux-foundation.org>


From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Jun 2008 14:40:35 -0700
Subject: [PATCH 2/4] Split up default "user" config parsing into helper routine

This follows the example of the "core" config, and splits out the
default "user" config option parsing into a helper routine.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 config.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config.c b/config.c
index c3597e0..ee7642b 100644
--- a/config.c
+++ b/config.c
@@ -464,11 +464,8 @@ static int git_default_core_config(const char *var, const char *value)
 	return 0;
 }
 
-int git_default_config(const char *var, const char *value, void *dummy)
+static int git_default_user_config(const char *var, const char *value)
 {
-	if (!prefixcmp(var, "core."))
-		return git_default_core_config(var, value);
-
 	if (!strcmp(var, "user.name")) {
 		if (!value)
 			return config_error_nonbool(var);
@@ -487,6 +484,18 @@ int git_default_config(const char *var, const char *value, void *dummy)
 		return 0;
 	}
 
+	/* Add other config variables here and to Documentation/config.txt. */
+	return 0;
+}
+
+int git_default_config(const char *var, const char *value, void *dummy)
+{
+	if (!prefixcmp(var, "core."))
+		return git_default_core_config(var, value);
+
+	if (!prefixcmp(var, "user."))
+		return git_default_user_config(var, value);
+
 	if (!strcmp(var, "i18n.commitencoding"))
 		return git_config_string(&git_commit_encoding, var, value);
 
-- 
1.5.6.rc3.7.g336d0.dirty

  reply	other threads:[~2008-06-18 22:34 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-18 22:29 [PATCH 0/4] Add 'core.fsyncobjectfiles' config option Linus Torvalds
2008-06-18 22:30 ` [PATCH 1/4] Split up default "core" config parsing into helper routine Linus Torvalds
2008-06-18 22:31   ` Linus Torvalds [this message]
2008-06-18 22:31     ` [PATCH 3/4] Split up default "i18n" and "branch" config parsing into helper routines Linus Torvalds
2008-06-18 22:32       ` [PATCH 4/4] Add config option to enable 'fsync()' of object files Linus Torvalds
2008-06-18 22:49   ` [PATCH 1/4] Split up default "core" config parsing into helper routine Jeff King
2008-06-18 22:58     ` Linus Torvalds
2008-06-18 23:13       ` Jeff King
2008-06-18 23:34         ` Linus Torvalds
2008-06-19  0:08           ` Jeff King
2008-06-19  0:23             ` Linus Torvalds
2008-06-19  0:28               ` Linus Torvalds
2008-06-19  2:10                 ` Daniel Barkalow
2008-06-19  0:32               ` Junio C Hamano
2008-06-19  1:23               ` Jeff King
2008-06-19  0:18           ` Eric Raible

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LFD.1.10.0806181530420.2907@woody.linux-foundation.org \
    --to=torvalds@linux-foundation.org \
    --cc=dbueno@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).