Re: [PATCH] read-cache: fix indentation in read_index_from

From: Stefan Beller <sbeller@google.com>
Date: Aug 31, 2015, 19:34 UTC
Message-ID: <CAGZ79kbQmmcJMW=07A1pyHdbViJTfseG4L-kspKEvyugTO7R4g@mail.gmail.com>
In-Reply-To: <xmqqpp23uuhk.fsf@gitster.mtv.corp.google.com>

On Mon, Aug 31, 2015 at 12:29 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 28 quoted lines

> 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.

Right. :(

The problem here is that I was looking to use read_index_from in the submodule code to implement recursive actions, but as I could not find documentation on how to use it, I read the code. And whenever I see obvious things to fix (such as style), I cannot stop myself from shooting from the hip, sending a patch. I'll stop doing that.

Show 6 quoted lines

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