@@ -273,29 +273,29 @@ static int config_read_branches(const char *key, const char *value, void *cb)
enum { REMOTE, MERGE, REBASE } type;
size_t key_len;
- key += 7;
- if (strip_suffix(key, ".remote", &key_len)) {
- name = xmemdupz(key, key_len);
+ key += strlen("branch.");
+ if (strip_suffix(key, ".remote", &key_len))
type = REMOTE;
- } else if (strip_suffix(key, ".merge", &key_len)) {
- name = xmemdupz(key, key_len);
+ else if (strip_suffix(key, ".merge", &key_len))
type = MERGE;
- } else if (strip_suffix(key, ".rebase", &key_len)) {
- name = xmemdupz(key, key_len);
+ else if (strip_suffix(key, ".rebase", &key_len))
type = REBASE;
- } else
+ else
return 0;
+ name = xmemdupz(key, key_len);
item = string_list_insert(&branch_list, name);
if (!item->util)
item->util = xcalloc(1, sizeof(struct branch_info));
info = item->util;
- if (type == REMOTE) {
+ switch (type) {
+ case REMOTE:
if (info->remote_name)
warning(_("more than one %s"), orig_key);
info->remote_name = xstrdup(value);
- } else if (type == MERGE) {
+ break;
+ case MERGE: {
char *space = strchr(value, ' ');
value = abbrev_branch(value);
while (space) {
@@ -306,8 +306,14 @@ static int config_read_branches(const char *key, const char *value, void *cb)
space = strchr(value, ' ');
}
string_list_append(&info->merge, xstrdup(value));
- } else
+ break;
+ }
+ case REBASE:
info->rebase = rebase_parse_value(value);
+ break;
+ default:
+ BUG("unexpected type=%d", type);
+ }
return 0;
}
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> --- Cc: Johannes Schindelin <johannes.schindelin@gmx.de> --- builtin/remote.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)