From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] style: indent multiline "if" conditions by 4 spaces
Date: Thu, 03 Dec 2020 10:22:35 -0800 [thread overview]
Message-ID: <xmqqv9dihhqs.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <X8ibEpkel8OMS/hV@coredump.intra.peff.net> (Jeff King's message of "Thu, 3 Dec 2020 03:00:18 -0500")
Jeff King <peff@peff.net> writes:
> Commit 6dc905d974 (config: split repo scope to local and worktree,
> 2020-02-10) made some "if" statements multiline, but didn't indent the
> second lines in our usual way.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> I just happened to be reading nearby code and saw this.
Can we rephrase "by 4 spaces" to avoid misleading new developers,
though? It's not like our rule is to indent continued expression by
4 spaces---it happens to be 4 in this case only because the second
line is aligned with the column inside "if (".
If the expression were
if ((A == X && B == Y &&
boolean_expression_on_the_second_line()) ||
C == Z)
we would have indented the second line to align with the inside of
the opening parenthesis, which may end up with "by 5 spaces", but
four vs five is not the important part of the equation.
Thanks.
> diff --git a/remote.c b/remote.c
> index 8a6dbbb903..8b9d090ae5 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -355,7 +355,7 @@ static int handle_config(const char *key, const char *value, void *cb)
> remote = make_remote(name, namelen);
> remote->origin = REMOTE_CONFIG;
> if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
> - current_config_scope() == CONFIG_SCOPE_WORKTREE)
> + current_config_scope() == CONFIG_SCOPE_WORKTREE)
> remote->configured_in_repo = 1;
> if (!strcmp(subkey, "mirror"))
> remote->mirror = git_config_bool(key, value);
> diff --git a/upload-pack.c b/upload-pack.c
> index 5dc8e1f844..a85d4ec502 100644
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -1302,7 +1302,7 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
> }
>
> if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
> - current_config_scope() != CONFIG_SCOPE_WORKTREE) {
> + current_config_scope() != CONFIG_SCOPE_WORKTREE) {
> if (!strcmp("uploadpack.packobjectshook", var))
> return git_config_string(&data->pack_objects_hook, var, value);
> }
next prev parent reply other threads:[~2020-12-03 18:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 8:00 [PATCH] style: indent multiline "if" conditions by 4 spaces Jeff King
2020-12-03 18:22 ` Junio C Hamano [this message]
2020-12-03 18:32 ` Jeff King
2020-12-03 18:38 ` Junio C Hamano
2020-12-03 18:51 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqv9dihhqs.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).