Re: [PATCH 2/7] remote: clean-up by returning early to avoid one indentation
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 23, 2020, 23:02 UTC
- Message-ID
- <xmqqk15h3hfd.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <59b97032fa158ccc9aee9d52b9cb969cd8df6a5f.1579598053.git.bert.wesarg@googlemail.com>
Bert Wesarg <bert.wesarg@googlemail.com> writes:
Show 38 quoted lines
> Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
>
> ---
> Cc: Junio C Hamano <gitster@pobox.com>
> ---
> 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).
Show 7 quoted lines
> - 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;