From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Derrick Stolee <stolee@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH 1/2] object-store: introduce OBJECT_INFO_NO_FETCH_IF_MISSING
Date: Thu, 20 Jun 2019 10:30:25 +0200 [thread overview]
Message-ID: <20190620083026.14524-2-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20190620083026.14524-1-chriscool@tuxfamily.org>
The fetch_if_missing global variable should be replaced as much
as possible by passing a flag to oid_object_info_extended().
The existing OBJECT_INFO_FOR_PREFETCH unfortunately conflates
both a "no fetch if missing" meaning with OBJECT_INFO_QUICK
which is about retrying packed storage.
Let's disambiguate that by adding a new explicit
OBJECT_INFO_NO_FETCH_IF_MISSING flag.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
object-store.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/object-store.h b/object-store.h
index 272e01e452..02c1795d50 100644
--- a/object-store.h
+++ b/object-store.h
@@ -277,10 +277,15 @@ struct object_info {
#define OBJECT_INFO_IGNORE_LOOSE 16
/*
* Do not attempt to fetch the object if missing (even if fetch_is_missing is
- * nonzero). This is meant for bulk prefetching of missing blobs in a partial
+ * nonzero).
+ */
+#define OBJECT_INFO_NO_FETCH_IF_MISSING 32
+/*
+ * This is meant for bulk prefetching of missing blobs in a partial
* clone. Implies OBJECT_INFO_QUICK.
*/
-#define OBJECT_INFO_FOR_PREFETCH (32 + OBJECT_INFO_QUICK)
+#define OBJECT_INFO_FOR_PREFETCH \
+ (OBJECT_INFO_NO_FETCH_IF_MISSING + OBJECT_INFO_QUICK)
int oid_object_info_extended(struct repository *r,
const struct object_id *,
--
2.22.0
next prev parent reply other threads:[~2019-06-20 8:30 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 8:30 [PATCH 0/2] Add OBJECT_INFO_NO_FETCH_IF_MISSING flag Christian Couder
2019-06-20 8:30 ` Christian Couder [this message]
2019-06-20 8:48 ` [PATCH 1/2] object-store: introduce OBJECT_INFO_NO_FETCH_IF_MISSING Jeff King
2019-06-20 8:30 ` [PATCH 2/2] sha1-file: use OBJECT_INFO_NO_FETCH_IF_MISSING Christian Couder
2019-06-20 8:50 ` Jeff King
2019-06-20 12:39 ` Derrick Stolee
2019-06-20 14:08 ` Christian Couder
2019-06-20 20:57 ` Junio C Hamano
2019-06-20 20:52 ` [PATCH 0/2] Add OBJECT_INFO_NO_FETCH_IF_MISSING flag Junio C Hamano
2019-06-21 10:47 ` Christian Couder
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=20190620083026.14524-2-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=stolee@gmail.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).