kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

remote: clean-up config callback 

Some minor clean-ups in function `config_read_branches`:

 * remove hardcoded length in `key += 7`
 * call `xmemdupz` only once
 * use a switch to handle the configuration type and add a `BUG()`

Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Bert Wesarg 2020-01-27 08:04:29 +01:00 committed by Junio C Hamano
parent 1a83068c26
commit ceff1a1308
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
builtin/remote.c
View File

@ -273,29 +273,29 @@ static int config_read_branches(const char *key, const char *value, void *cb)
if (!starts_with(key, "branch.")) if (!starts_with(key, "branch."))
return 0; return 0;


key += 7; key += strlen("branch.");
if (strip_suffix(key, ".remote", &key_len)) { if (strip_suffix(key, ".remote", &key_len))
name = xmemdupz(key, key_len);
type = REMOTE; type = REMOTE;
} else if (strip_suffix(key, ".merge", &key_len)) { else if (strip_suffix(key, ".merge", &key_len))
name = xmemdupz(key, key_len);
type = MERGE; type = MERGE;
} else if (strip_suffix(key, ".rebase", &key_len)) { else if (strip_suffix(key, ".rebase", &key_len))
name = xmemdupz(key, key_len);
type = REBASE; type = REBASE;
} else else
return 0; return 0;
name = xmemdupz(key, key_len);


item = string_list_insert(&branch_list, name); item = string_list_insert(&branch_list, name);


if (!item->util) if (!item->util)
item->util = xcalloc(1, sizeof(struct branch_info)); item->util = xcalloc(1, sizeof(struct branch_info));
info = item->util; info = item->util;
if (type == REMOTE) { switch (type) {
case REMOTE:
if (info->remote_name) if (info->remote_name)
warning(_("more than one %s"), orig_key); warning(_("more than one %s"), orig_key);
info->remote_name = xstrdup(value); info->remote_name = xstrdup(value);
} else if (type == MERGE) { break;
case MERGE: {
char *space = strchr(value, ' '); char *space = strchr(value, ' ');
value = abbrev_branch(value); value = abbrev_branch(value);
while (space) { while (space) {
@ -306,12 +306,18 @@ static int config_read_branches(const char *key, const char *value, void *cb)
space = strchr(value, ' '); space = strchr(value, ' ');
} }
string_list_append(&info->merge, xstrdup(value)); string_list_append(&info->merge, xstrdup(value));
} else break;
}
case REBASE:
/* /*
* Consider invalid values as false and check the * Consider invalid values as false and check the
* truth value with >= REBASE_TRUE. * truth value with >= REBASE_TRUE.
*/ */
info->rebase = rebase_parse_value(value); info->rebase = rebase_parse_value(value);
break;
default:
BUG("unexpected type=%d", type);
}


return 0; return 0;
} }