| Message ID | 20190620083026.14524-3-chriscool@tuxfamily.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add OBJECT_INFO_NO_FETCH_IF_MISSING flag | expand |
On Thu, Jun 20, 2019 at 10:30:26AM +0200, Christian Couder wrote: > Currently the OBJECT_INFO_FOR_PREFETCH flag is used to check > if we should fetch objects from promisor remotes when we > haven't found them elsewhere. > > Now that OBJECT_INFO_NO_FETCH_IF_MISSING exists, let's use > it instead to be more correct in case this new flag is ever > used without OBJECT_INFO_QUICK. I said earlier that this one would need to be tweaked for the new upstream name. But actually, I think it is not necessary after Stolee's patch. -Peff
On 6/20/2019 4:50 AM, Jeff King wrote: > On Thu, Jun 20, 2019 at 10:30:26AM +0200, Christian Couder wrote: > >> Currently the OBJECT_INFO_FOR_PREFETCH flag is used to check >> if we should fetch objects from promisor remotes when we >> haven't found them elsewhere. >> >> Now that OBJECT_INFO_NO_FETCH_IF_MISSING exists, let's use >> it instead to be more correct in case this new flag is ever >> used without OBJECT_INFO_QUICK. > > I said earlier that this one would need to be tweaked for the new > upstream name. But actually, I think it is not necessary after Stolee's > patch. Yes, I believe that 31f5256c82 does an equivalent thing to the combination of these patches. Thanks, -Stolee
On Thu, Jun 20, 2019 at 2:39 PM Derrick Stolee <stolee@gmail.com> wrote: > > On 6/20/2019 4:50 AM, Jeff King wrote: > > On Thu, Jun 20, 2019 at 10:30:26AM +0200, Christian Couder wrote: > > > >> Currently the OBJECT_INFO_FOR_PREFETCH flag is used to check > >> if we should fetch objects from promisor remotes when we > >> haven't found them elsewhere. > >> > >> Now that OBJECT_INFO_NO_FETCH_IF_MISSING exists, let's use > >> it instead to be more correct in case this new flag is ever > >> used without OBJECT_INFO_QUICK. > > > > I said earlier that this one would need to be tweaked for the new > > upstream name. But actually, I think it is not necessary after Stolee's > > patch. > > Yes, I believe that 31f5256c82 does an equivalent thing to the > combination of these patches. Yeah, I agree. Thanks Stolee for having already fixed that, and sorry for bothering everyone with this. Christian.
Christian Couder <christian.couder@gmail.com> writes: > On Thu, Jun 20, 2019 at 2:39 PM Derrick Stolee <stolee@gmail.com> wrote: >> >> On 6/20/2019 4:50 AM, Jeff King wrote: >> > On Thu, Jun 20, 2019 at 10:30:26AM +0200, Christian Couder wrote: >> > >> >> Currently the OBJECT_INFO_FOR_PREFETCH flag is used to check >> >> if we should fetch objects from promisor remotes when we >> >> haven't found them elsewhere. >> >> >> >> Now that OBJECT_INFO_NO_FETCH_IF_MISSING exists, let's use >> >> it instead to be more correct in case this new flag is ever >> >> used without OBJECT_INFO_QUICK. >> > >> > I said earlier that this one would need to be tweaked for the new >> > upstream name. But actually, I think it is not necessary after Stolee's >> > patch. >> >> Yes, I believe that 31f5256c82 does an equivalent thing to the >> combination of these patches. > > Yeah, I agree. Thanks Stolee for having already fixed that, and sorry > for bothering everyone with this. OK, I'll stop looking at this patch.
diff --git a/sha1-file.c b/sha1-file.c index ed5c50dac4..2116ff1e70 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -1379,7 +1379,7 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid, /* Check if it is a missing object */ if (fetch_if_missing && repository_format_partial_clone && !already_retried && r == the_repository && - !(flags & OBJECT_INFO_FOR_PREFETCH)) { + !(flags & OBJECT_INFO_NO_FETCH_IF_MISSING)) { /* * TODO Investigate having fetch_object() return * TODO error/success and stopping the music here.
Currently the OBJECT_INFO_FOR_PREFETCH flag is used to check if we should fetch objects from promisor remotes when we haven't found them elsewhere. Now that OBJECT_INFO_NO_FETCH_IF_MISSING exists, let's use it instead to be more correct in case this new flag is ever used without OBJECT_INFO_QUICK. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- sha1-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)