public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] read-cache: fix indentation in read_index_from
Date: Mon, 31 Aug 2015 12:29:43 -0700	[thread overview]
Message-ID: <xmqqpp23uuhk.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1441046609-24181-1-git-send-email-sbeller@google.com> (Stefan Beller's message of "Mon, 31 Aug 2015 11:43:29 -0700")

Stefan Beller <sbeller@google•com> writes:

> Signed-off-by: Stefan Beller <sbeller@google•com>
> ---
>  read-cache.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index 89dbc08..a3df665 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -1653,7 +1653,7 @@ int read_index_from(struct index_state *istate, const char *path)
>  		die("broken index, expect %s in %s, got %s",
>  		    sha1_to_hex(split_index->base_sha1),
>  		    git_path("sharedindex.%s",
> -				     sha1_to_hex(split_index->base_sha1)),
> +			     sha1_to_hex(split_index->base_sha1)),

We allow two styles in our codebase, (1) indent to align with
opening parenthesis, or (2) indent sufficiently deeper than the
first line with HT.  The original is neither, so in that sense
it is a good thing to do in the long run.

I'll queue it for this time, but in general, I'd prefer if people
refrained from touching code only for style fixes in an area that is
touched actively in topics, unless it is done inside a topic that
has to touch that area of the code in order to do something more
than style fixes.

Thanks.

>  		    sha1_to_hex(split_index->base->sha1));
>  	merge_base_index(istate);
>  	check_ce_order(istate);

next prev parent reply	other threads:[~2015-08-31 19:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-31 18:43 [PATCH] read-cache: fix indentation in read_index_from Stefan Beller
2015-08-31 19:29 ` Junio C Hamano [this message]
2015-08-31 19:34   ` Stefan Beller
2015-08-31 20:12     ` Junio C Hamano

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=xmqqpp23uuhk.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=sbeller@google$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox