Re: [PATCH 2/7] remote: clean-up by returning early to avoid one indentation
From: Junio C Hamano <hidden>
Date: 2020-01-23 23:02:35
Bert Wesarg [off-list ref] writes:
quoted hunk
Signed-off-by: Bert Wesarg <redacted> --- Cc: Junio C Hamano <redacted> --- builtin/remote.c | 86 +++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 42 deletions(-)diff --git a/builtin/remote.c b/builtin/remote.c index 2830c4ab33..a8bdaca4f4 100644 --- a/builtin/remote.c +++ b/builtin/remote.c@@ -263,50 +263,52 @@ 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; + if (!starts_with(key, "branch.")) + return 0;
That's way too early. We must have all decl/defn before the first statement (see Documentation/CodingGuidelines).
- item = string_list_insert(&branch_list, name);
+ 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;