[PATCH 3/3] clone: always fetch remote HEAD
- From
Jeff King <peff@peff.net>
- Date
- Jun 3, 2011, 05:18 UTC
- Message-ID
- <20110603051805.GC1008@sigill.intra.peff.net>
- In-Reply-To
- <20110603050901.GA883@sigill.intra.peff.net>
In most cases, fetching the remote HEAD explicitly is unnecessary. It's just a symref pointing to a branch which we are already fetching, so we will already ask for its sha1.
However, if the remote has a detached HEAD, things are less certain. We do not ask for HEAD's sha1, but we do try to write it into a local detached HEAD. In most cases this is fine, as the remote HEAD is pointing to some part of the history graph that we will fetch via the refs.
But if the remote HEAD points to an "orphan" commit (one which was is not an ancestor of any refs), then we will not have the object, and update_ref will complain when we try to write the detached HEAD, aborting the whole clone.
This patch makes clone always explicitly ask the remote for the sha1 of its HEAD commit. In the non-detached case, this is a no-op, as we were going to ask for that sha1 anyway. In the regular detached case, this will add an extra "want" to the protocol negotiation, but will not change the history that gets sent. And in the detached orphan case, we will fetch the orphaned history so that we can write it into our local detached HEAD.
Signed-off-by: Jeff King <peff@peff.net> --- [+cc Sverre and Jonathan for remote-helper advice]
This fails t5800, with:
expecting success:
git clone "testgit::${PWD}/server" localclone &&
test_cmp public/file localclone/fileCloning into localclone... fatal: Got feature command 'relative-marks' after data command fast-import: dumping crash report to ...
So I guess it doesn't like us asking for HEAD. But the fact that it sends weird data to fast-import instead of saying "hey, HEAD doesn't exist" has me confused. I'm not sure if this is something one should not be doing with remote helpers, or if the testgit helper is simply buggy or incomplete.
builtin/clone.c | 10 +++++++--- t/t5707-clone-detached.sh | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c index f579794..a99f1c8 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -343,8 +343,9 @@ static void remove_junk_on_signal(int signo) static struct ref *wanted_peer_refs(const struct ref *refs, struct refspec *refspec) { - struct ref *local_refs = NULL; - struct ref **tail = &local_refs; + struct ref *head = get_remote_ref(refs, "HEAD"); + struct ref *local_refs = head; + struct ref **tail = head ? &head->next : &local_refs; get_fetch_map(refs, refspec, &tail, 0); if (!option_mirror) @@ -357,8 +358,11 @@ static void write_remote_refs(const struct ref *local_refs) { const struct ref *r; - for (r = local_refs; r; r = r->next) + for (r = local_refs; r; r = r->next) { + if (!r->peer_ref) + continue; add_extra_ref(r->peer_ref->name, r->old_sha1, 0); + } pack_refs(PACK_REFS_ALL); clear_extra_refs(); diff --git a/t/t5707-clone-detached.sh b/t/t5707-clone-detached.sh index db4af95..82ecbce 100755 --- a/t/t5707-clone-detached.sh +++ b/t/t5707-clone-detached.sh @@ -58,18 +58,18 @@ test_expect_success 'cloned HEAD is detached' ' head_is_detached detached-history ' -test_expect_failure 'clone repo (orphan detached HEAD)' ' +test_expect_success 'clone repo (orphan detached HEAD)' ' git checkout --detach master && echo four >file && git commit -a -m four && git clone "file://$PWD" detached-orphan ' -test_expect_failure 'cloned HEAD matches' ' +test_expect_success 'cloned HEAD matches' ' echo four >expect && git --git-dir=detached-orphan/.git log -1 --format=%s >actual && test_cmp expect actual ' -test_expect_failure 'cloned HEAD is detached' ' +test_expect_success 'cloned HEAD is detached' ' head_is_detached detached-orphan '
-- 1.7.6.rc0.36.g5a0d