git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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;
Previous: Bert WesargNext: Bert Wesarg
Message 3 of 18 in “remote rename: improve handling of configuration values”
  1. 0/7 remote rename: improve handling of configuration valuesBert Wesarg, Jan 21, 2020
  2. 2/7 remote: clean-up by returning early to avoid one indentationBert Wesarg, Jan 21, 2020
  3. Junio C HamanoJan 23, 2020
  4. 1/7 pull --rebase/remote rename: document and honor single-letter abbreviations rebase typesBert Wesarg, Jan 21, 2020
  5. Junio C HamanoJan 21, 2020
  6. Bert WesargJan 22, 2020
  7. Junio C HamanoJan 22, 2020
  8. 3/7 remote: clean-up config callbackBert Wesarg, Jan 21, 2020
  9. 5/7 [RFC] config: make `scope_name` global as `config_scope_name`Bert Wesarg, Jan 21, 2020
  10. Matt RogersJan 22, 2020
  11. Bert WesargJan 22, 2020
  12. Matt RogersJan 23, 2020
  13. 4/7 remote rename: rename branch.<name>.pushRemote config values tooBert Wesarg, Jan 21, 2020
  14. 7/7 remote rename: gently handle remote.pushDefault configBert Wesarg, Jan 21, 2020
  15. Junio C HamanoJan 23, 2020
  16. Bert WesargJan 24, 2020
  17. 6/7 config: provide access to the current line numberBert Wesarg, Jan 21, 2020
  18. Bert WesargJan 22, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.