[PATCH] Add an option to specify a file to config builtin

[PATCH] Add an option to specify a file to config builtin

[Alex Riesen]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

There are (really!) systems where using environment variables is very
cumbersome (yes, Windows, it has problems unsetting them). Besides this
form is shorter.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 Documentation/git-config.txt |   29 ++++++++++++++++-------------
 builtin-config.c             |    9 ++++++++-
 2 files changed, 24 insertions(+), 14 deletions(-)

[-- Attachment #2: 0001-Add-an-option-to-specify-a-file-to-config-builtin.txt --]
[-- Type: text/plain, Size: 4716 bytes --]

From 787abe4b0a71856b8671a41c9b83561fde84e558 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 31 Jul 2007 11:58:43 +0200
Subject: [PATCH] Add an option to specify a file to config builtin

There are (really!) systems where using environment variables is very
cumbersome (yes, Windows, it has problems unsetting them). Besides this
form is shorter.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 Documentation/git-config.txt |   29 ++++++++++++++++-------------
 builtin-config.c             |    9 ++++++++-
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 5f66a7f..88acf6c 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -9,17 +9,17 @@ git-config - Get and set repository or global options
 SYNOPSIS
 --------
 [verse]
-'git-config' [--system | --global] [type] [-z|--null] name [value [value_regex]]
-'git-config' [--system | --global] [type] --add name value
-'git-config' [--system | --global] [type] --replace-all name [value [value_regex]]
-'git-config' [--system | --global] [type] [-z|--null] --get name [value_regex]
-'git-config' [--system | --global] [type] [-z|--null] --get-all name [value_regex]
-'git-config' [--system | --global] [type] [-z|--null] --get-regexp name_regex [value_regex]
-'git-config' [--system | --global] --unset name [value_regex]
-'git-config' [--system | --global] --unset-all name [value_regex]
-'git-config' [--system | --global] --rename-section old_name new_name
-'git-config' [--system | --global] --remove-section name
-'git-config' [--system | --global] [-z|--null] -l | --list
+'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] name [value [value_regex]]
+'git-config' [--system | --global | [-f|--file] config-file] [type] --add name value
+'git-config' [--system | --global | [-f|--file] config-file] [type] --replace-all name [value [value_regex]]
+'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get name [value_regex]
+'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get-all name [value_regex]
+'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get-regexp name_regex [value_regex]
+'git-config' [--system | --global | [-f|--file] config-file] --unset name [value_regex]
+'git-config' [--system | --global | [-f|--file] config-file] --unset-all name [value_regex]
+'git-config' [--system | --global | [-f|--file] config-file] --rename-section old_name new_name
+'git-config' [--system | --global | [-f|--file] config-file] --remove-section name
+'git-config' [--system | --global | [-f|--file] config-file] [-z|--null] -l | --list
 
 DESCRIPTION
 -----------
@@ -42,8 +42,8 @@ no checks or transformations are performed on the value.
 
 This command will fail if:
 
-. The .git/config file is invalid,
-. Can not write to .git/config,
+. The config file is invalid,
+. Can not write to the config file,
 . no section was provided,
 . the section or key is invalid,
 . you try to unset an option which does not exist,
@@ -93,6 +93,9 @@ rather than from all available files.
 +
 See also <<FILES>>.
 
+-f config-file, --file config-file::
+	Use the given config file instead of the one specified by GIT_CONFIG.
+
 --remove-section::
 	Remove the given section from the configuration file.
 
diff --git a/builtin-config.c b/builtin-config.c
index 7d2063c..0a605e0 100644
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -2,7 +2,7 @@
 #include "cache.h"
 
 static const char git_config_set_usage[] =
-"git-config [ --global | --system ] [ --bool | --int ] [ -z | --null ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list";
+"git-config [ --global | --system | [ -f | --file ] config-file ] [ --bool | --int ] [ -z | --null ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list";
 
 static char *key;
 static regex_t *key_regexp;
@@ -186,6 +186,13 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		}
 		else if (!strcmp(argv[1], "--system"))
 			setenv(CONFIG_ENVIRONMENT, ETC_GITCONFIG, 1);
+		else if (!strcmp(argv[1], "--file") || !strcmp(argv[1], "-f")) {
+			if (argc < 3)
+				usage(git_config_set_usage);
+			setenv(CONFIG_ENVIRONMENT, argv[2], 1);
+			argc--;
+			argv++;
+		}
 		else if (!strcmp(argv[1], "--null") || !strcmp(argv[1], "-z")) {
 			term = '\0';
 			delim = '\n';
-- 
1.5.3.rc3.132.g39179

Re: [PATCH] Add an option to specify a file to config builtin

[Johannes Schindelin]

Hi,

On Tue, 31 Jul 2007, Alex Riesen wrote:

> There are (really!) systems where using environment variables is very
> cumbersome (yes, Windows, it has problems unsetting them). Besides this
> form is shorter.

You could use this chance to make the verse nicer, i.e. split it into a 
[<file-option>] and an [<action>] part.

Ciao,
Dscho

Re: [PATCH] Add an option to specify a file to config builtin

[Alex Riesen]

On 7/31/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>
> > There are (really!) systems where using environment variables is very
> > cumbersome (yes, Windows, it has problems unsetting them). Besides this
> > form is shorter.
>
> You could use this chance to make the verse nicer, i.e. split it into a
> [<file-option>] and an [<action>] part.

Missed that opportunity for today, I'm afraid. Will try to get to it
the next evening

[PATCH] Make verse of git-config manpage more readable

[Alex Riesen]

Also mention '--file' in FILES.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---

Alex Riesen, Tue, Jul 31, 2007 14:02:13 +0200:
> On 7/31/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > You could use this chance to make the verse nicer, i.e. split it into a
> > [<file-option>] and an [<action>] part.

Did only the long one, file-option. I don't think the [<action>] part
is essential, though. It is quite understandable...

 Documentation/git-config.txt |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 88acf6c..8451ccc 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -9,17 +9,17 @@ git-config - Get and set repository or global options
 SYNOPSIS
 --------
 [verse]
-'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] name [value [value_regex]]
-'git-config' [--system | --global | [-f|--file] config-file] [type] --add name value
-'git-config' [--system | --global | [-f|--file] config-file] [type] --replace-all name [value [value_regex]]
-'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get name [value_regex]
-'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get-all name [value_regex]
-'git-config' [--system | --global | [-f|--file] config-file] [type] [-z|--null] --get-regexp name_regex [value_regex]
-'git-config' [--system | --global | [-f|--file] config-file] --unset name [value_regex]
-'git-config' [--system | --global | [-f|--file] config-file] --unset-all name [value_regex]
-'git-config' [--system | --global | [-f|--file] config-file] --rename-section old_name new_name
-'git-config' [--system | --global | [-f|--file] config-file] --remove-section name
-'git-config' [--system | --global | [-f|--file] config-file] [-z|--null] -l | --list
+'git-config' [<file-option>] [type] [-z|--null] name [value [value_regex]]
+'git-config' [<file-option>] [type] --add name value
+'git-config' [<file-option>] [type] --replace-all name [value [value_regex]]
+'git-config' [<file-option>] [type] [-z|--null] --get name [value_regex]
+'git-config' [<file-option>] [type] [-z|--null] --get-all name [value_regex]
+'git-config' [<file-option>] [type] [-z|--null] --get-regexp name_regex [value_regex]
+'git-config' [<file-option>] --unset name [value_regex]
+'git-config' [<file-option>] --unset-all name [value_regex]
+'git-config' [<file-option>] --rename-section old_name new_name
+'git-config' [<file-option>] --remove-section name
+'git-config' [<file-option>] [-z|--null] -l | --list
 
 DESCRIPTION
 -----------
@@ -40,6 +40,12 @@ convert the value to the canonical form (simple decimal number for int,
 a "true" or "false" string for bool).  If no type specifier is passed,
 no checks or transformations are performed on the value.
 
+The file-option can be one of '--system', '--global' or '--file'
+which specify where the values will be read from or written to.
+The default is to assume the config file of the current repository,
+.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG
+(see <<FILES>>).
+
 This command will fail if:
 
 . The config file is invalid,
@@ -133,8 +139,8 @@ See also <<FILES>>.
 FILES
 -----
 
-There are three files where git-config will search for configuration
-options:
+If not set explicitely with '--file', there are three files where
+git-config will search for configuration options:
 
 .git/config::
 	Repository specific configuration file. (The filename is
-- 
1.5.3.rc3.116.g94fd8

Re: [PATCH] Make verse of git-config manpage more readable

[Johannes Schindelin]

Hi,

On Wed, 1 Aug 2007, Alex Riesen wrote:

> Also mention '--file' in FILES.
> 
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
> 
> Alex Riesen, Tue, Jul 31, 2007 14:02:13 +0200:
> > On 7/31/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > > You could use this chance to make the verse nicer, i.e. split it into a
> > > [<file-option>] and an [<action>] part.
> 
> Did only the long one, file-option. I don't think the [<action>] part
> is essential, though. It is quite understandable...

It is too long.  That's my gripe with it.  But then, I do not really care; 
I know pretty well what "git config" can do...

Ciao,
Dscho