mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'pb/repo'
* pb/repo: Add support for explicit type specifiers when calling git-repo-config
This commit is contained in:
commit
af8c28e145
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue