mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow hierarchical section names

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2005-11-20 21:22:19 +01:00
committed by Junio C Hamano
parent 3dd94e3b2e
commit b17e659dd4
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
config.c
View File

@ -143,7 +143,7 @@ static int get_base_var(char *name)
return -1; return -1;
if (c == ']') if (c == ']')
return baselen; return baselen;
if (!isalnum(c)) if (!isalnum(c) && c != '.')
return -1; return -1;
if (baselen > MAXNAME / 2) if (baselen > MAXNAME / 2)
return -1; return -1;
@ -405,28 +405,29 @@ int git_config_set_multivar(const char* key, const char* value,
int fd; int fd;
char* config_file = strdup(git_path("config")); char* config_file = strdup(git_path("config"));
char* lock_file = strdup(git_path("config.lock")); char* lock_file = strdup(git_path("config.lock"));
const char* last_dot = strrchr(key, '.');
store.multi_replace = multi_replace;
/* /*
* Since "key" actually contains the section name and the real * Since "key" actually contains the section name and the real
* key name separated by a dot, we have to know where the dot is. * key name separated by a dot, we have to know where the dot is.
*/ */
for (store.baselen = 0;
key[store.baselen] != '.' && key[store.baselen]; if (last_dot == NULL) {
store.baselen++);
if (!key[store.baselen] || !key[store.baselen+1]) {
fprintf(stderr, "key does not contain a section: %s\n", key); fprintf(stderr, "key does not contain a section: %s\n", key);
return 2; return 2;
} }
store.baselen = last_dot - key;
store.multi_replace = multi_replace;
/* /*
* Validate the key and while at it, lower case it for matching. * Validate the key and while at it, lower case it for matching.
*/ */
store.key = (char*)malloc(strlen(key)+1); store.key = (char*)malloc(strlen(key)+1);
for (i = 0; key[i]; i++) for (i = 0; key[i]; i++)
if (i != store.baselen && (!isalnum(key[i]) || if (i != store.baselen &&
(i == store.baselen+1 && !isalpha(key[i])))) { ((!isalnum(key[i]) && key[i] != '.') ||
(i == store.baselen+1 && !isalpha(key[i])))) {
fprintf(stderr, "invalid key: %s\n", key); fprintf(stderr, "invalid key: %s\n", key);
free(store.key); free(store.key);
return 1; return 1;

19
t/t1300-config-set.sh
View File

@ -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 '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 test_done