From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sun, 20 Nov 2005 20:22:19 +0000 (+0100)
Subject: Allow hierarchical section names
X-Git-Tag: v0.99.9k^2~31
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b17e659dd4007cb1d3eb5ac32b524c0c5ab59601;p=git.git

Allow hierarchical section names

A .git/config like follows becomes valid with this patch:

	[remote.junio]
		url = git://git.kernel.org/pub/scm/git/git.git
		pull = master:junio todo:todo +pu:pu

	[remote.ibook]
		url = ibook:git/
		pull = master:ibook
		push = master:quetzal

(This patch only does the ini file thing, git-fetch and friends still
ignore these values).

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

diff --git a/config.c b/config.c
index e78520ba..357c1caf 100644
--- a/config.c
+++ b/config.c
@@ -143,7 +143,7 @@ static int get_base_var(char *name)
 			return -1;
 		if (c == ']')
 			return baselen;
-		if (!isalnum(c))
+		if (!isalnum(c) && c != '.')
 			return -1;
 		if (baselen > MAXNAME / 2)
 			return -1;
@@ -405,28 +405,29 @@ int git_config_set_multivar(const char* key, const char* value,
 	int fd;
 	char* config_file = strdup(git_path("config"));
 	char* lock_file = strdup(git_path("config.lock"));
-
-	store.multi_replace = multi_replace;
+	const char* last_dot = strrchr(key, '.');
 
 	/*
 	 * Since "key" actually contains the section name and the real
 	 * key name separated by a dot, we have to know where the dot is.
 	 */
-	for (store.baselen = 0;
-			key[store.baselen] != '.' && key[store.baselen];
-			store.baselen++);
-	if (!key[store.baselen] || !key[store.baselen+1]) {
+
+	if (last_dot == NULL) {	
 		fprintf(stderr, "key does not contain a section: %s\n", key);
 		return 2;
 	}
+	store.baselen = last_dot - key;
+
+	store.multi_replace = multi_replace;
 
 	/*
 	 * Validate the key and while at it, lower case it for matching.
 	 */
 	store.key = (char*)malloc(strlen(key)+1);
 	for (i = 0; key[i]; i++)
-		if (i != store.baselen && (!isalnum(key[i]) ||
-				(i == store.baselen+1 && !isalpha(key[i])))) {
+		if (i != store.baselen &&
+				((!isalnum(key[i]) && key[i] != '.') ||
+				 (i == store.baselen+1 && !isalpha(key[i])))) {
 			fprintf(stderr, "invalid key: %s\n", key);
 			free(store.key);
 			return 1;
diff --git a/t/t1300-config-set.sh b/t/t1300-config-set.sh
index 59b6c4c8..7a5849ae 100644
--- a/t/t1300-config-set.sh
+++ b/t/t1300-config-set.sh
@@ -248,5 +248,24 @@ test_expect_failure 'invalid key' 'git-config-set inval.2key blabla'
 
 test_expect_success 'correct key' 'git-config-set 123456.a123 987'
 
+test_expect_success 'hierarchical section' \
+	'git-config-set 1.2.3.alpha beta'
+
+cat > expect << EOF
+[beta] ; silly comment # another comment
+noIndent= sillyValue ; 'nother silly comment
+
+# empty line
+		; comment
+[nextSection]
+	NoNewLine = wow2 for me
+[123456]
+	a123 = 987
+[1.2.3]
+	alpha = beta
+EOF
+
+test_expect_success 'hierarchical section value' 'cmp .git/config expect'
+
 test_done