remote: clean-up by returning early to avoid one indentation

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/remote.c b/builtin/remote.c
index 6802765e736ad727573793fe12fd703a8b88a38f..4cf929bfc6891cd4be4690be3461873f11de58f0 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -263,54 +263,56 @@ static const char *abbrev_ref(const char *name, const char *prefix)
 
 static int config_read_branches(const char *key, const char *value, void *cb)
 {
-       if (starts_with(key, "branch.")) {
-               const char *orig_key = key;
-               char *name;
-               struct string_list_item *item;
-               struct branch_info *info;
-               enum { REMOTE, MERGE, REBASE } type;
-               size_t key_len;
-
-               key += 7;
-               if (strip_suffix(key, ".remote", &key_len)) {
-                       name = xmemdupz(key, key_len);
-                       type = REMOTE;
-               } else if (strip_suffix(key, ".merge", &key_len)) {
-                       name = xmemdupz(key, key_len);
-                       type = MERGE;
-               } else if (strip_suffix(key, ".rebase", &key_len)) {
-                       name = xmemdupz(key, key_len);
-                       type = REBASE;
-               } else
-                       return 0;
+       const char *orig_key = key;
+       char *name;
+       struct string_list_item *item;
+       struct branch_info *info;
+       enum { REMOTE, MERGE, REBASE } type;
+       size_t key_len;
 
-               item = string_list_insert(&branch_list, name);
+       if (!starts_with(key, "branch."))
+               return 0;
+
+       key += 7;
+       if (strip_suffix(key, ".remote", &key_len)) {
+               name = xmemdupz(key, key_len);
+               type = REMOTE;
+       } else if (strip_suffix(key, ".merge", &key_len)) {
+               name = xmemdupz(key, key_len);
+               type = MERGE;
+       } else if (strip_suffix(key, ".rebase", &key_len)) {
+               name = xmemdupz(key, key_len);
+               type = REBASE;
+       } else
+               return 0;
+
+       item = string_list_insert(&branch_list, name);
+
+       if (!item->util)
+               item->util = xcalloc(1, sizeof(struct branch_info));
+       info = item->util;
+       if (type == REMOTE) {
+               if (info->remote_name)
+                       warning(_("more than one %s"), orig_key);
+               info->remote_name = xstrdup(value);
+       } else if (type == MERGE) {
+               char *space = strchr(value, ' ');
+               value = abbrev_branch(value);
+               while (space) {
+                       char *merge;
+                       merge = xstrndup(value, space - value);
+                       string_list_append(&info->merge, merge);
+                       value = abbrev_branch(space + 1);
+                       space = strchr(value, ' ');
+               }
+               string_list_append(&info->merge, xstrdup(value));
+       } else
+               /*
+                * Consider invalid values as false and check the
+                * truth value with >= REBASE_TRUE.
+                */
+               info->rebase = rebase_parse_value(value);
 
-               if (!item->util)
-                       item->util = xcalloc(1, sizeof(struct branch_info));
-               info = item->util;
-               if (type == REMOTE) {
-                       if (info->remote_name)
-                               warning(_("more than one %s"), orig_key);
-                       info->remote_name = xstrdup(value);
-               } else if (type == MERGE) {
-                       char *space = strchr(value, ' ');
-                       value = abbrev_branch(value);
-                       while (space) {
-                               char *merge;
-                               merge = xstrndup(value, space - value);
-                               string_list_append(&info->merge, merge);
-                               value = abbrev_branch(space + 1);
-                               space = strchr(value, ' ');
-                       }
-                       string_list_append(&info->merge, xstrdup(value));
-               } else
-                       /*
-                        * Consider invalid values as false and check the
-                        * truth value with >= REBASE_TRUE.
-                        */
-                       info->rebase = rebase_parse_value(value);
-       }
        return 0;
 }