diff options
| author | Jonathan Tan <jonathantanmy@google.com> | 2019-11-13 03:34:19 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-13 05:48:47 +0300 |
| commit | e362fadcd03753471cf8e7fc91d6d721b7423b8f (patch) | |
| tree | 8b9bbf166b6c4c9555f91ceb7ee22c38fe74d582 /connected.c | |
| parent | 6462d5eb9a5b23ab9cff4e3c92ff930600562d8f (diff) | |
clone: remove fetch_if_missing=0
Commit 6462d5eb9a ("fetch: remove fetch_if_missing=0", 2019-11-08)
strove to remove the need for fetch_if_missing=0 from the fetching
mechanism, so it is plausible to attempt removing fetch_if_missing=0
from clone as well. But doing so reveals a bug - when the server does
not send an object directly pointed to by a ref, this should be an
error, not a trigger for a lazy fetch. (This case in the fetching
mechanism was covered by a test using "git clone", not "git fetch",
which is why the aforementioned commit didn't uncover the bug.)
The bug can be fixed by suppressing lazy-fetching during the
connectivity check. Fix this bug, and remove fetch_if_missing from
clone.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'connected.c')
| -rw-r--r-- | connected.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/connected.c b/connected.c index 36c4e5dedb..c337f5f7f4 100644 --- a/connected.c +++ b/connected.c @@ -62,7 +62,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data, * received the objects pointed to by each wanted ref. */ do { - if (!repo_has_object_file(the_repository, &oid)) + if (!repo_has_object_file_with_flags(the_repository, &oid, + OBJECT_INFO_SKIP_FETCH_OBJECT)) return 1; } while (!fn(cb_data, &oid)); return 0; |