From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 05/11] submodule.c: fix indentation
Date: Thu, 06 Sep 2018 10:34:03 -0700 [thread overview]
Message-ID: <xmqqin3i1qes.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180904230149.180332-6-sbeller@google.com> (Stefan Beller's message of "Tue, 4 Sep 2018 16:01:43 -0700")
Stefan Beller <sbeller@google.com> writes:
> The submodule subsystem is really bad at staying within 80 characters.
> Fix it while we are here.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> submodule.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/submodule.c b/submodule.c
> index da2ed8696f5..8345d423fda 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -1244,7 +1244,8 @@ static int get_next_submodule(struct child_process *cp,
> if (!submodule) {
> const char *name = default_name_or_path(ce->name);
> if (name) {
> - default_submodule.path = default_submodule.name = name;
> + default_submodule.path = name;
> + default_submodule.name = name;
Besides indentation, it is good to avoid A = B = C assignment.
Written this way, it is more obvious that these two fields share the
same pointer.
Good.
> submodule = &default_submodule;
> }
> }
> @@ -1254,8 +1255,9 @@ static int get_next_submodule(struct child_process *cp,
> default:
> case RECURSE_SUBMODULES_DEFAULT:
> case RECURSE_SUBMODULES_ON_DEMAND:
> - if (!submodule || !unsorted_string_list_lookup(&changed_submodule_names,
> - submodule->name))
> + if (!submodule || !unsorted_string_list_lookup(
> + &changed_submodule_names,
> + submodule->name))
if (!submodule ||
!unsorted_string_list_lookup(
&changed_submodule_names,
submodule->name))
would be easier to see what is going on.
next prev parent reply other threads:[~2018-09-06 17:34 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-04 23:01 [PATCH 00/11] fetch: make sure submodule oids are fetched Stefan Beller
2018-09-04 23:01 ` [PATCH 01/11] string_list: print_string_list to use trace_printf Stefan Beller
2018-09-06 16:52 ` Junio C Hamano
2018-09-06 16:56 ` Jeff King
2018-09-06 22:16 ` Stefan Beller
2018-09-07 0:04 ` Jeff King
2018-09-07 9:53 ` Junio C Hamano
2018-09-07 17:21 ` Stefan Beller
2018-09-10 21:58 ` [PATCH 1/2] trace: add trace_print_string_list_key Stefan Beller
2018-09-10 21:58 ` [PATCH 2/2] string-list: remove unused function print_string_list Stefan Beller
2018-09-10 22:32 ` [PATCH 1/2] trace: add trace_print_string_list_key Junio C Hamano
2018-09-10 22:38 ` Stefan Beller
2018-09-11 0:52 ` Junio C Hamano
2018-09-11 3:08 ` Stefan Beller
2018-09-11 21:03 ` Jeff King
2018-09-11 18:48 ` [PATCH] string-list: remove unused function print_string_list Stefan Beller
2018-09-11 19:27 ` Junio C Hamano
2018-09-11 19:30 ` Junio C Hamano
2018-09-11 19:47 ` Stefan Beller
2018-09-11 20:53 ` Junio C Hamano
2018-09-04 23:01 ` [PATCH 02/11] string-list.h: add string_list_{pop, last} functions Stefan Beller
2018-09-06 17:10 ` Junio C Hamano
2018-09-06 22:29 ` Stefan Beller
2018-09-04 23:01 ` [PATCH 03/11] sha1-array: provide oid_array_filter Stefan Beller
2018-09-06 17:20 ` Junio C Hamano
2018-09-04 23:01 ` [PATCH 04/11] submodule.c: convert submodule_move_head new argument to object id Stefan Beller
2018-09-06 17:31 ` Junio C Hamano
2018-09-04 23:01 ` [PATCH 05/11] submodule.c: fix indentation Stefan Beller
2018-09-06 17:34 ` Junio C Hamano [this message]
2018-09-04 23:01 ` [PATCH 06/11] submodule.c: sort changed_submodule_names before searching it Stefan Beller
2018-09-06 18:03 ` Junio C Hamano
2018-09-11 18:31 ` Stefan Beller
2018-09-04 23:01 ` [PATCH 07/11] submodule: move global changed_submodule_names into fetch submodule struct Stefan Beller
2018-09-06 18:04 ` Junio C Hamano
2018-09-04 23:01 ` [PATCH 08/11] submodule.c: do not copy around submodule list Stefan Beller
2018-09-06 18:20 ` Junio C Hamano
2018-09-04 23:01 ` [PATCH 09/11] submodule: fetch in submodules git directory instead of in worktree Stefan Beller
2018-09-04 23:01 ` [PATCH 10/11] fetch: retry fetching submodules if sha1 were not fetched Stefan Beller
2018-09-04 23:01 ` [PATCH 11/11] builtin/fetch: check for submodule updates for non branch fetches Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqin3i1qes.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).