From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>,
peff@peff.net, gitster@pobox.com
Subject: [PATCH v2 1/3] object-file: don't exit early if skipping loose
Date: Tue, 6 Dec 2022 16:40:51 -0800 [thread overview]
Message-ID: <9ad34a1dce977044066de0bfa6e25977215e8dc9.1670373420.git.jonathantanmy@google.com> (raw)
In-Reply-To: <cover.1670373420.git.jonathantanmy@google.com>
Instead, also search the submodule object stores and promisor remotes.
This also centralizes what happens when the object is not found (the
"return -1"), which is useful for a subsequent patch.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
object-file.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/object-file.c b/object-file.c
index 26290554bb..596dd049fd 100644
--- a/object-file.c
+++ b/object-file.c
@@ -1575,18 +1575,17 @@ static int do_oid_object_info_extended(struct repository *r,
if (find_pack_entry(r, real, &e))
break;
- if (flags & OBJECT_INFO_IGNORE_LOOSE)
- return -1;
-
- /* Most likely it's a loose object. */
- if (!loose_object_info(r, real, oi, flags))
- return 0;
-
- /* Not a loose object; someone else may have just packed it. */
- if (!(flags & OBJECT_INFO_QUICK)) {
- reprepare_packed_git(r);
- if (find_pack_entry(r, real, &e))
- break;
+ if (!(flags & OBJECT_INFO_IGNORE_LOOSE)) {
+ /* Most likely it's a loose object. */
+ if (!loose_object_info(r, real, oi, flags))
+ return 0;
+
+ /* Not a loose object; someone else may have just packed it. */
+ if (!(flags & OBJECT_INFO_QUICK)) {
+ reprepare_packed_git(r);
+ if (find_pack_entry(r, real, &e))
+ break;
+ }
}
/*
--
2.39.0.rc0.267.gcb52ba06e7-goog
next prev parent reply other threads:[~2022-12-07 0:41 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 20:30 [PATCH 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-11-30 20:30 ` [PATCH 1/4] object-file: reread object with exact same args Jonathan Tan
2022-11-30 20:30 ` [PATCH 2/4] object-file: refactor corrupt object diagnosis Jonathan Tan
2022-11-30 20:47 ` Jeff King
2022-11-30 23:42 ` Junio C Hamano
2022-12-01 19:06 ` Jonathan Tan
2022-11-30 20:30 ` [PATCH 3/4] object-file: refactor replace object lookup Jonathan Tan
2022-11-30 20:54 ` Jeff King
2022-11-30 20:30 ` [PATCH 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-11-30 21:04 ` Jeff King
2022-12-01 19:11 ` Jonathan Tan
2022-12-01 19:33 ` Jeff King
2022-11-30 23:56 ` Junio C Hamano
2022-11-30 21:06 ` [PATCH 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-01 19:27 ` [PATCH v2 " Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 1/4] object-file: reread object with exact same args Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 2/4] object-file: refactor corrupt object diagnosis Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 3/4] object-file: refactor replace object lookup Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-01 19:54 ` [PATCH v2 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-01 21:26 ` Jonathan Tan
2022-12-02 0:23 ` Jeff King
2022-12-06 0:49 ` Jonathan Tan
2022-12-06 2:03 ` Jeff King
2022-12-01 23:09 ` Junio C Hamano
2022-12-07 0:40 ` [PATCH v2 0/3] " Jonathan Tan
2022-12-07 0:40 ` Jonathan Tan [this message]
2022-12-07 1:12 ` [PATCH v2 1/3] object-file: don't exit early if skipping loose Junio C Hamano
2022-12-07 6:14 ` Jeff King
2022-12-07 6:43 ` Junio C Hamano
2022-12-07 23:20 ` Jonathan Tan
2022-12-07 0:40 ` [PATCH v2 2/3] object-file: emit corruption errors when detected Jonathan Tan
2022-12-07 1:16 ` Junio C Hamano
2022-12-07 4:05 ` Ævar Arnfjörð Bjarmason
2022-12-07 7:07 ` Jeff King
2022-12-07 10:33 ` Ævar Arnfjörð Bjarmason
2022-12-07 23:26 ` Jonathan Tan
2022-12-07 23:50 ` Ævar Arnfjörð Bjarmason
2022-12-08 6:33 ` Jeff King
2022-12-07 6:42 ` Jeff King
2022-12-07 0:40 ` [PATCH v2 3/3] commit: don't lazy-fetch commits Jonathan Tan
2022-12-07 1:17 ` Junio C Hamano
2022-12-07 6:47 ` Jeff King
2022-12-08 20:57 ` [PATCH v3 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-09 2:00 ` Jeff King
2022-12-09 18:17 ` Jonathan Tan
2022-12-09 20:27 ` Jeff King
2022-12-09 20:27 ` Jeff King
2022-12-08 20:57 ` [PATCH v3 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-09 1:56 ` Jeff King
2022-12-09 18:26 ` Jonathan Tan
2022-12-09 14:19 ` Ævar Arnfjörð Bjarmason
2022-12-09 18:33 ` Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-09 14:14 ` Ævar Arnfjörð Bjarmason
2022-12-09 21:44 ` [PATCH v4 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-10 0:16 ` Junio C Hamano
2022-12-12 20:38 ` Jonathan Tan
2022-12-12 20:49 ` Jeff King
2022-12-12 20:59 ` Jonathan Tan
2022-12-12 21:20 ` Jeff King
2022-12-12 21:29 ` Jonathan Tan
2022-12-12 22:17 ` Jeff King
2022-12-12 22:52 ` Jonathan Tan
2022-12-13 10:37 ` Jeff King
2022-12-09 21:44 ` [PATCH v4 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-13 1:51 ` Junio C Hamano
2022-12-13 10:38 ` Jeff King
2022-12-12 22:48 ` [PATCH v5 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-14 20:43 ` [PATCH v6 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-15 0:07 ` 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=9ad34a1dce977044066de0bfa6e25977215e8dc9.1670373420.git.jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).