From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Jonathan Tan <jonathantanmy@google.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] object-file: fix indent-with-space
Date: Thu, 12 Jan 2023 17:08:35 +0100 [thread overview]
Message-ID: <230112.864jsv20r2.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <Y8AwGdtrsjnBdXN7@coredump.intra.peff.net>
On Thu, Jan 12 2023, Jeff King wrote:
> On Thu, Jan 12, 2023 at 10:13:20AM +0100, Ævar Arnfjörð Bjarmason wrote:
>
>>
>> On Sat, Jan 07 2023, Jeff King wrote:
>>
>> > + oi.typep = type;
>> > + oi.sizep = size;
>> > + oi.contentp = &data;
>> > + if (lookup_replace)
>> > + flags |= OBJECT_INFO_LOOKUP_REPLACE;
>> > + if (oid_object_info_extended(r, oid, &oi, flags))
>> > + return NULL;
>>
>> Style: This is "\t ", but should be "\t\t".
>
> Hmph, I'm not sure how I managed that. Thanks for pointing it out. The
> commit is in 'next', so I think we'd want this on top (of
> jk/read-object-cleanup).
> -- >8 --
> Subject: [PATCH] object-file: fix indent-with-space
>
> Commit b25562e63f (object-file: inline calls to read_object(),
> 2023-01-07) accidentally indented a conditional block with spaces
> instead of a tab.
>
> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> object-file.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/object-file.c b/object-file.c
> index 80b08fc389..ce9efae994 100644
> --- a/object-file.c
> +++ b/object-file.c
> @@ -1708,7 +1708,7 @@ void *repo_read_object_file(struct repository *r,
> oi.sizep = size;
> oi.contentp = &data;
> if (oid_object_info_extended(r, oid, &oi, flags))
> - return NULL;
> + return NULL;
>
> return data;
> }
Thanks, I didn't notice (assuming it was too soon, it being less than a
week) that it was in "next" already. This change LGTM, thanks!
next prev parent reply other threads:[~2023-01-12 16:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-07 13:48 [PATCH 0/5] cleaning up read_object() family of functions Jeff King
2023-01-07 13:48 ` [PATCH 1/5] object-file: inline calls to read_object() Jeff King
2023-01-12 9:13 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:06 ` [PATCH] object-file: fix indent-with-space Jeff King
2023-01-12 16:08 ` Ævar Arnfjörð Bjarmason [this message]
2023-01-13 17:40 ` Junio C Hamano
2023-01-07 13:49 ` [PATCH 2/5] streaming: inline call to read_object_file_extended() Jeff King
2023-01-07 13:50 ` [PATCH 3/5] read_object_file_extended(): drop lookup_replace option Jeff King
2023-01-07 13:50 ` [PATCH 4/5] repo_read_object_file(): stop wrapping read_object_file_extended() Jeff King
2023-01-07 13:50 ` [PATCH 5/5] packfile: inline custom read_object() Jeff King
2023-01-12 9:01 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:29 ` Jeff King
2023-01-09 15:09 ` [PATCH 0/5] cleaning up read_object() family of functions Derrick Stolee
2023-01-11 18:26 ` Jeff King
2023-01-11 20:17 ` Derrick Stolee
2023-01-11 20:30 ` Jeff King
2023-01-12 9:21 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:16 ` Jeff King
2023-01-12 16:22 ` Ævar Arnfjörð Bjarmason
2023-01-12 16:53 ` 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=230112.864jsv20r2.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--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).