diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-12 05:02:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-12 05:02:30 -0800 |
| commit | af8c28e145a3ba28515f3cb34bbcd345693b3480 (patch) | |
| tree | 9544060adb793f1f392d7d529677cda88f0688b9 | |
| parent | c611db196a8830135e1a03e5b4fa6502714ded24 (diff) | |
| parent | 7162dff3dde6fb0a2829fbc8e641fc6d1e7e76ec (diff) | |
| download | git-af8c28e145a3ba28515f3cb34bbcd345693b3480.tar.gz git-af8c28e145a3ba28515f3cb34bbcd345693b3480.tar.xz | |
Merge branch 'pb/repo'
* pb/repo:
Add support for explicit type specifiers when calling git-repo-config
| -rw-r--r-- | Documentation/git-repo-config.txt | 18 | ||||
| -rw-r--r-- | repo-config.c | 27 |
2 files changed, 37 insertions, 8 deletions
diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt index 306946412..33fcde452 100644 --- 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 -------- -'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 ----------- @@ -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). +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, diff --git a/repo-config.c b/repo-config.c index c31e441a3..9cf65193f 100644 --- a/repo-config.c +++ b/repo-config.c @@ -2,7 +2,7 @@ #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; @@ -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 enum { T_RAW, T_INT, T_BOOL } type = T_RAW; 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); } - 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; @@ -73,6 +84,18 @@ static int get_value(const char* key_, const char* regex_) 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); |