From: Junio C Hamano <gitster@pobox.com>
To: Richard Oliver <roliver@roku.com>
Cc: Jeff King <peff@peff.net>, Taylor Blau <me@ttaylorr.com>,
Derrick Stolee <derrickstolee@github.com>,
git@vger.kernel.org, jonathantanmy@google.com
Subject: Re: [PATCH] mktree: do not check type of remote objects
Date: Tue, 21 Jun 2022 10:48:46 -0700 [thread overview]
Message-ID: <xmqqilothpq9.fsf@gitster.g> (raw)
In-Reply-To: <748f39a9-65aa-2110-cf92-7ddf81b5f507@roku.com> (Richard Oliver's message of "Tue, 21 Jun 2022 14:59:39 +0100")
Richard Oliver <roliver@roku.com> writes:
> + /* Check the type of object identified by oid without fetching objects */
> + struct object_info oi = OBJECT_INFO_INIT;
This is -Wdecl-after-statement.
> + oi.typep = &obj_type;
> + if (oid_object_info_extended(the_repository, &oid, &oi,
> + OBJECT_INFO_LOOKUP_REPLACE |
> + OBJECT_INFO_QUICK |
> + OBJECT_INFO_SKIP_FETCH_OBJECT) < 0)
> + obj_type = -1;
> +
> if (obj_type < 0) {
> if (allow_missing) {
> ; /* no problem - missing objects are presumed to be of the right type */
I've done an obvious and trivial fix-up locally while queueing.
Thanks.
diff --git a/builtin/mktree.c b/builtin/mktree.c
index cfadb52670..06d81400f5 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -74,6 +74,7 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
unsigned mode;
enum object_type mode_type; /* object type derived from mode */
enum object_type obj_type; /* object type derived from sha */
+ struct object_info oi = OBJECT_INFO_INIT;
char *path, *to_free = NULL;
struct object_id oid;
@@ -117,7 +118,6 @@ static void mktree_line(char *buf, int nul_term_line, int allow_missing)
}
/* Check the type of object identified by oid without fetching objects */
- struct object_info oi = OBJECT_INFO_INIT;
oi.typep = &obj_type;
if (oid_object_info_extended(the_repository, &oid, &oi,
OBJECT_INFO_LOOKUP_REPLACE |
prev parent reply other threads:[~2022-06-21 17:49 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 13:36 [PATCH] mktree: learn about promised objects Richard Oliver
2022-06-14 14:14 ` Derrick Stolee
2022-06-14 16:33 ` Richard Oliver
2022-06-14 17:27 ` Derrick Stolee
2022-06-15 0:35 ` Taylor Blau
2022-06-15 4:00 ` Jeff King
2022-06-15 17:40 ` Richard Oliver
2022-06-15 18:17 ` Derrick Stolee
2022-06-16 6:07 ` Jeff King
2022-06-16 6:54 ` [PATCH] is_promisor_object(): walk promisor packs in pack-order Jeff King
2022-06-16 14:00 ` Derrick Stolee
2022-06-17 19:50 ` Jonathan Tan
2022-06-16 13:59 ` [PATCH] mktree: learn about promised objects Derrick Stolee
2022-06-15 21:01 ` Junio C Hamano
2022-06-16 5:02 ` Jeff King
2022-06-16 15:46 ` [PATCH] mktree: Make '--missing' behave as documented Richard Oliver
2022-06-16 17:44 ` Junio C Hamano
2022-06-21 13:59 ` [PATCH] mktree: do not check type of remote objects Richard Oliver
2022-06-21 16:51 ` Junio C Hamano
2022-06-21 17:48 ` Junio C Hamano [this message]
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=xmqqilothpq9.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=roliver@roku.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.
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).