Add support for explicit type specifiers when calling git-repo-config

Currently, git-repo-config will just return the raw value of option
as specified in the config file; this makes things difficult for scripts
calling it, especially if the value is supposed to be boolean.

This patch makes it possible to ask git-repo-config to check if the option
is of the given type (int or bool) and write out the value in its
canonical form. If you do not pass --int or --bool, the behaviour stays
unchanged and the raw value is emitted.

This also incidentally fixes the segfault when option with no value is
encountered.

[jc: tweaked the option parsing a bit to make it easier to see
that the patch does not change anything but the type stuff in
the diff output.  Also changed to avoid "foo ? : bar" construct. ]

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index 306946412fe669727a4b113e2e64bb1d45d62ecf..33fcde452a3e6e795b93848acc7c4a4656ee1bf0 100644 (file)
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -8,12 +8,12 @@ git-repo-config - Get and set options in .git/config.
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-repo-config' name [value [value_regex]]
-'git-repo-config' --replace-all name [value [value_regex]]
-'git-repo-config' --get name [value_regex]
-'git-repo-config' --get-all name [value_regex]
-'git-repo-config' --unset name [value_regex]
-'git-repo-config' --unset-all name [value_regex]
+'git-repo-config' [type] name [value [value_regex]]
+'git-repo-config' [type] --replace-all name [value [value_regex]]
+'git-repo-config' [type] --get name [value_regex]
+'git-repo-config' [type] --get-all name [value_regex]
+'git-repo-config' [type] --unset name [value_regex]
+'git-repo-config' [type] --unset-all name [value_regex]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -26,6 +26,12 @@ should provide a POSIX regex for the value. If you want to handle the lines
 *not* matching the regex, just prepend a single exclamation mark in front
 (see EXAMPLES).
 
 *not* matching the regex, just prepend a single exclamation mark in front
 (see EXAMPLES).
 

+The type specifier can be either '--int' or '--bool', which will make
+'git-repo-config' ensure that the variable(s) are of the given type and
+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.
+

 This command will fail if
 
 . .git/config is invalid,
 This command will fail if
 
 . .git/config is invalid,

diff --git a/repo-config.c b/repo-config.c
index c31e441a3ddf486d30121bd1feea3945748a40f1..9cf65193f95022e50e51d380ca050bef87653555 100644 (file)
--- a/repo-config.c
+++ b/repo-config.c
@@ -2,7 +2,7 @@
 #include <regex.h>
 
 static const char git_config_set_usage[] =
 #include <regex.h>
 
 static const char git_config_set_usage[] =

-"git-repo-config [--get | --get-all | --replace-all | --unset | --unset-all] name [value [value_regex]]";
+"git-repo-config [ --bool | --int ] [--get | --get-all | --replace-all | --unset | --unset-all] name [value [value_regex]]";

 
 static char* key = NULL;
 static char* value = NULL;
 
 static char* key = NULL;
 static char* value = NULL;


@@ -10,6 +10,7 @@ static regex_t* regexp = NULL;
 static int do_all = 0;
 static int do_not_match = 0;
 static int seen = 0;
 static int do_all = 0;
 static int do_not_match = 0;
 static int seen = 0;

+static enum { T_RAW, T_INT, T_BOOL } type = T_RAW;

 
 static int show_config(const char* key_, const char* value_)
 {
 
 static int show_config(const char* key_, const char* value_)
 {


@@ -25,7 +26,17 @@ static int show_config(const char* key_, const char* value_)
                        fprintf(stderr, "More than one value: %s\n", value);
                        free(value);
                }
                        fprintf(stderr, "More than one value: %s\n", value);
                        free(value);
                }

-               value = strdup(value_);
+
+               if (type == T_INT) {
+                       value = malloc(256);
+                       sprintf(value, "%d", git_config_int(key_, value_));
+               } else if (type == T_BOOL) {
+                       value = malloc(256);
+                       sprintf(value, "%s", git_config_bool(key_, value_)
+                                            ? "true" : "false");
+               } else {
+                       value = strdup(value_ ? value_ : "");
+               }

                seen++;
        }
        return 0;
                seen++;
        }
        return 0;


@@ -73,6 +84,18 @@ static int get_value(const char* key_, const char* regex_)
 int main(int argc, const char **argv)
 {
        setup_git_directory();
 int main(int argc, const char **argv)
 {
        setup_git_directory();

+
+       while (1 < argc) {
+               if (!strcmp(argv[1], "--int"))
+                       type = T_INT;
+               else if (!strcmp(argv[1], "--bool"))
+                       type = T_BOOL;
+               else
+                       break;
+               argc--;
+               argv++;
+       }
+

        switch (argc) {
        case 2:
                return get_value(argv[1], NULL);
        switch (argc) {
        case 2:
                return get_value(argv[1], NULL);