diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-25 00:50:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-25 00:50:44 +0300 |
| commit | 88df0fa6597fd32b0394c544fb37d6655bd34a13 (patch) | |
| tree | 994bc28a9b8fc27ca1cf2460a8377c79e737d9f6 /builtin/clone.c | |
| parent | 43013305887c2b81858a0741f39872f8ed5f27d6 (diff) | |
| parent | cf1e7c07705eb21c30d0ee414810e7bc8fdf7d82 (diff) | |
Merge branch 'jt/connectivity-check-after-unshallow'
"git fetch" failed to correctly validate the set of objects it
received when making a shallow history deeper, which has been
corrected.
* jt/connectivity-check-after-unshallow:
fetch-pack: write shallow, then check connectivity
fetch-pack: implement ref-in-want
fetch-pack: put shallow info in output parameter
fetch: refactor to make function args narrower
fetch: refactor fetch_refs into two functions
fetch: refactor the population of peer ref OIDs
upload-pack: test negotiation with changing repository
upload-pack: implement ref-in-want
test-pkt-line: add unpack-sideband subcommand
Diffstat (limited to 'builtin/clone.c')
| -rw-r--r-- | builtin/clone.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 1d939af9d8..2f84717e11 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -1156,7 +1156,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) } if (!is_local && !complete_refs_before_fetch) - transport_fetch_refs(transport, mapped_refs); + transport_fetch_refs(transport, mapped_refs, NULL); remote_head = find_ref_by_name(refs, "HEAD"); remote_head_points_at = @@ -1198,7 +1198,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (is_local) clone_local(path, git_dir); else if (refs && complete_refs_before_fetch) - transport_fetch_refs(transport, mapped_refs); + transport_fetch_refs(transport, mapped_refs, NULL); update_remote_refs(refs, mapped_refs, remote_head_points_at, branch_top.buf, reflog_msg.buf, transport, |