From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>,
gitster@pobox.com, tikuta@chromium.org
Subject: [PATCH] sha1_file: restore OBJECT_INFO_QUICK functionality
Date: Tue, 13 Mar 2018 08:30:29 -0700 [thread overview]
Message-ID: <20180313153029.257296-1-jonathantanmy@google.com> (raw)
In-Reply-To: <xmqqr2ouwgsd.fsf@gitster-ct.c.googlers.com>
Support for the OBJECT_INFO_QUICK flag in sha1_object_info_extended()
was added in commit dfdd4afcf9 ("sha1_file: teach
sha1_object_info_extended more flags", 2017-06-26) in order to support
commit e83e71c5e1 ("sha1_file: refactor has_sha1_file_with_flags",
2017-06-26), but it was inadvertently removed in commit 8b4c0103a9
("sha1_file: support lazily fetching missing objects", 2017-12-08).
Restore this functionality.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
---
> Hmm, OBJECT_INFO_QUICK optimization was added in dfdd4afc
> ("sha1_file: teach sha1_object_info_extended more flags",
> 2017-06-21), but since 8b4c0103 ("sha1_file: support lazily fetching
> missing objects", 2017-12-08) it appears that passing
> OBJECT_INFO_QUICK down the codepath does not do anything
> interesting. Jonathan (cc'ed), are all remaining hits from "git
> grep OBJECT_INFO_QUICK" all dead no-ops these days?
They are, but they are not supposed to be. Here is a patch correcting
that.
---
sha1_file.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index 1b94f39c4..cc0f43ea8 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1267,9 +1267,11 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi,
return 0;
/* Not a loose object; someone else may have just packed it. */
- reprepare_packed_git();
- if (find_pack_entry(real, &e))
- break;
+ if (!(flags & OBJECT_INFO_QUICK)) {
+ reprepare_packed_git();
+ if (find_pack_entry(real, &e))
+ break;
+ }
/* Check if it is a missing object */
if (fetch_if_missing && repository_format_partial_clone &&
--
2.16.2.660.g709887971b-goog
prev parent reply other threads:[~2018-03-13 16:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-08 12:06 [PATCH] fetch-pack.c: use oidset to check existence of loose object Takuto Ikuta
2018-03-08 17:19 ` René Scharfe
2018-03-09 13:42 ` Takuto Ikuta
2018-03-08 18:42 ` Junio C Hamano
2018-03-09 13:11 ` [PATCH v2 0/1] " Takuto Ikuta
2018-03-09 13:11 ` [PATCH v2 1/1] " Takuto Ikuta
2018-03-09 13:26 ` [PATCH v3] " Takuto Ikuta
2018-03-09 19:54 ` Junio C Hamano
2018-03-10 13:19 ` Takuto Ikuta
2018-03-13 17:53 ` Junio C Hamano
2018-03-14 6:26 ` Takuto Ikuta
2018-03-10 12:34 ` [PATCH v4] " Takuto Ikuta
2018-03-10 12:46 ` [PATCH v5] " Takuto Ikuta
2018-03-13 19:04 ` Junio C Hamano
2018-03-14 6:05 ` [PATCH v6] " Takuto Ikuta
2018-03-14 6:32 ` [PATCH v7] " Takuto Ikuta
2018-03-09 14:12 ` [PATCH] " Takuto Ikuta
2018-03-09 18:00 ` Junio C Hamano
2018-03-09 19:41 ` Junio C Hamano
2018-03-13 15:30 ` Jonathan Tan [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=20180313153029.257296-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tikuta@chromium.org \
/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).