X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=repo-config.c;h=fa8aba7a1b8760f0316ef0d47c40b0078316ff57;hb=97d4df0b29d262df291985aed486e226b43132d0;hp=c31e441a3ddf486d30121bd1feea3945748a40f1;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/repo-config.c b/repo-config.c
index c31e441a..fa8aba7a 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]] | --list";
 
 static char* key = NULL;
 static char* value = NULL;
@@ -10,9 +10,22 @@ 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_all_config(const char *key_, const char *value_)
+{
+	if (value_)
+		printf("%s=%s\n", key_, value_);
+	else
+		printf("%s\n", key_);
+	return 0;
+}
 
 static int show_config(const char* key_, const char* value_)
 {
+	if (value_ == NULL)
+		value_ = "";
+
 	if (!strcmp(key_, key) &&
 			(regexp == NULL ||
 			 (do_not_match ^
@@ -25,7 +38,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_);
+		}
 		seen++;
 	}
 	return 0;
@@ -53,7 +76,7 @@ static int get_value(const char* key_, const char* regex_)
 		}
 	}
 
-	i = git_config(show_config);
+	git_config(show_config);
 	if (value) {
 		printf("%s\n", value);
 		free(value);
@@ -73,6 +96,21 @@ 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++;
+	}
+
+	if (!strcmp(argv[1], "--list") || !strcmp(argv[1], "-l"))
+		return git_config(show_all_config);
+
 	switch (argc) {
 	case 2:
 		return get_value(argv[1], NULL);