repo-config: deconvolute logics

It was rightly noticed that the logic is quite convoluted. Fix that.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

repo-config.c

@@ -27,17 +27,20 @@ static int show_config(const char* key_, const char* value_)
 {
 	char value[256];
 	const char *vptr = value;
+	int dup_error = 0;
 
 	if (value_ == NULL)
 		value_ = "";
 
-	if ((use_key_regexp || !strcmp(key_, key)) &&
-			(!use_key_regexp ||
-			 !regexec(key_regexp, key_, 0, NULL, 0)) &&
-			(regexp == NULL ||
+	if (!use_key_regexp && strcmp(key_, key))
+		return 0;
+	if (use_key_regexp && regexec(key_regexp, key_, 0, NULL, 0))
+		return 0;
+	if (regexp != NULL &&
 			 (do_not_match ^
-			  !regexec(regexp, value_, 0, NULL, 0)))) {
-		int dup_error = 0;
+			  regexec(regexp, value_, 0, NULL, 0)))
+		return 0;
+
 	if (show_keys)
 		printf("%s ", key_);
 	if (seen && !do_all)
@@ -45,8 +48,7 @@ static int show_config(const char* key_, const char* value_)
 	if (type == T_INT)
 		sprintf(value, "%d", git_config_int(key_, value_));
 	else if (type == T_BOOL)
-			sprintf(value, "%s", git_config_bool(key_, value_)
-					     ? "true" : "false");
+		vptr = git_config_bool(key_, value_) ? "true" : "false";
 	else
 		vptr = value_;
 	seen++;
@@ -56,7 +58,7 @@ static int show_config(const char* key_, const char* value_)
 	}
 	else
 		printf("%s\n", vptr);
-	}
+
 	return 0;
 }