public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: "Philip Oakley" <philipoakley@iee•org>
Cc: "Andreas Krey" <a.krey@gmx•de>, "Git Mailing List" <git@vger•kernel.org>
Subject: Re: [PATCH 0/3] Unconfuse git clone when two branches at are HEAD.
Date: Mon, 09 Sep 2013 15:26:53 -0700	[thread overview]
Message-ID: <xmqqk3ip3a36.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CBB3BFF2B74D4A768238512FBF1CD6E7@PhilipOakley> (Philip Oakley's message of "Mon, 9 Sep 2013 23:20:41 +0100")

"Philip Oakley" <philipoakley@iee•org> writes:

> These look to work OK. Not sure If I've properly covered all the
> options.
>
> A nice feature is that ls-remote will find the fake ref !
>
> $ git ls-remote /c/gitBundleTest1/RepoHEADnomaster.bundle Test:HEAD
> 41ccb18028d1cb6516251e94cef1cd5cb3f0bcb5        refs/heads/Test:HEAD
>
> It's only the clone that barfs (so far) (which could be 'fixed').

You cannot 'fix' the ones deployed in the wild, but I think saying
"funny ref" and not aborting is a good compromise.  The updated
documentation for bundle can mention that error message and explain
that the older version of "clone" will say that in what situation.

I didn't notice it the first time, but I think the above would read
better and match what has been discussed on the on-the-wire format
to swap the order, i.e. use "HEAD:refs/heads/Test" to mean "HEAD is
a symref that points at the Test branch".

> Obviously, if it can be made to work, one check would be that the two
> refs (HEAD and refs/heads/wherever) point to the came commit before
> generating the HEAD symref.

Yes, that is a sensible check.

      reply	other threads:[~2013-09-09 22:27 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-06 15:52 [PATCH 0/3] Unconfuse git clone when two branches at are HEAD Andreas Krey
2013-09-06 15:56 ` [PATCH 1/3] upload-pack: send the HEAD information Andreas Krey
2013-09-06 17:46   ` Junio C Hamano
2013-09-06 19:29     ` Andreas Krey
2013-09-06 19:54       ` Junio C Hamano
2013-09-08  7:13     ` Jeff King
2013-09-08  7:22       ` Jeff King
2013-09-08 17:27       ` Junio C Hamano
2013-09-18  2:31   ` [PATCH v2 0/6] Removing the guesswork of HEAD in "clone" Junio C Hamano
2013-09-18  2:31     ` [PATCH v2 1/6] upload-pack.c: do not pass confusing cb_data to mark_our_ref() Junio C Hamano
2013-09-18  2:31     ` [PATCH v2 2/6] upload-pack: send symbolic ref information as capability Junio C Hamano
2013-09-18  4:36       ` Junio C Hamano
2013-09-18  2:31     ` [PATCH v2 3/6] upload-pack: send non-HEAD symbolic refs Junio C Hamano
2013-09-18  2:31     ` [PATCH v2 4/6] connect.c: make parse_feature_value() static Junio C Hamano
2013-09-18  2:31     ` [PATCH v2 5/6] connect: annotate refs with their symref information in get_remote_head() Junio C Hamano
2013-09-18  2:31     ` [PATCH v2 6/6] clone: test the new HEAD detection logic Junio C Hamano
2013-09-06 15:56 ` [PATCH 2/3] connect.c: save symref info from server capabilities Andreas Krey
2013-09-06 17:56   ` Junio C Hamano
2013-09-06 19:25     ` Andreas Krey
2013-09-06 19:46       ` Junio C Hamano
2013-09-06 15:57 ` [PATCH 3/3] clone: test the new HEAD detection logic Andreas Krey
2013-09-06 17:29 ` [PATCH 0/3] Unconfuse git clone when two branches at are HEAD Philip Oakley
2013-09-06 18:17   ` Junio C Hamano
2013-09-06 23:19     ` Philip Oakley
2013-09-07 15:50       ` Junio C Hamano
2013-09-07 19:19         ` Philip Oakley
2013-09-08 17:35           ` Junio C Hamano
2013-09-08 21:00             ` Philip Oakley
2013-09-09 14:44               ` Junio C Hamano
2013-09-09 16:08                 ` Andreas Krey
2013-09-09 22:20                 ` Philip Oakley
2013-09-09 22:26                   ` Junio C Hamano [this message]

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqk3ip3a36.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=a.krey@gmx$(echo .)de \
    --cc=git@vger$(echo .)kernel.org \
    --cc=philipoakley@iee$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox