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> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Linus Torvalds committed Jun 18, 2008 at 14:40 UTC d1364529d06e5fa3bc054396299944a7a4861776

1 file changed +13 -4

config.c

+13 -4

@@ -464,11 +464,8 @@ static int git_default_core_config(const char *var, const char *value)

464 return 0;

465 }

466

467 -int git_default_config(const char *var, const char *value, void *dummy)

467 +static int git_default_user_config(const char *var, const char *value)

468 {

469 - if (!prefixcmp(var, "core."))

470 - return git_default_core_config(var, value);

471 -

469 if (!strcmp(var, "user.name")) {

470 if (!value)

471 return config_error_nonbool(var);

@@ -487,6 +484,18 @@ int git_default_config(const char *var, const char *value, void *dummy)

484 return 0;

485 }

486

487 + /* Add other config variables here and to Documentation/config.txt. */

488 + return 0;

489 +}

490 +

491 +int git_default_config(const char *var, const char *value, void *dummy)

492 +{

493 + if (!prefixcmp(var, "core."))

494 + return git_default_core_config(var, value);

495 +

496 + if (!prefixcmp(var, "user."))

497 + return git_default_user_config(var, value);

498 +

499 if (!strcmp(var, "i18n.commitencoding"))

500 return git_config_string(&git_commit_encoding, var, value);

501