git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Fwd: [PATCH/RFC] upload-pack: ignore 'shallow' lines with unknown obj-ids

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 29, 2013, 03:25 UTC
Message-ID
<7v7gjmow6o.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CAJDSCnN_Va7r2BMLYSbsSzoUNs6YfYfihatb-u4jJw25w8qvZg@mail.gmail.com>
Michael Heemskerk <mheemskerk@atlassian.com> writes:
Show 28 quoted lines
> Re-sent to the mailing list because the original was bounced (HTML subpart):
> ...
>
> With the patch applied, the server ignores the shallow line mentioned by
> the server and will not send a "shallow" or "unshallow" line for it back to
> the client. This scenario is not explicitly described in pack-protocol.txt
> but I'd be happy to add it to. I'll also update the comment to cover this
> aspect.
>
> As Duy pointed out, it doesn't cause problems in the current C Git
> implementation: the client adds a new entry to the shallow file for each
> "shallow" line it receives from the server and removes an entry for each
> "unshallow" line it receives. Any current shallow object that is not
> mentioned by the server is still marked as shallow after the fetch.
>
> I think that's how it should be: it should be the client's
> responsibility to track
> the list of objects it only has in shallow form. It should not rely on
> the server
> to tell it what that list is. Again, an extra line or two in pack-protocol.txt
> would help to clear this up.
> ...
>> > I do not seem to find the patch you are responding to, so I do not
>> > know how the patch handled the unshallowing part, but the impression
>> > I got from reading the log message quoted is that the patch was not
>> > even aware of the issue.
>>
>> I can't find it on gmane.org either. Patch quoted below.

OK, the change the patch text shows looks sensible to me. Can you resend it in full, with the log message, your sign-off, and Duy's "Reviewed-by:", so that it can be applied?

Thanks.
Show 9 quoted lines
>> On Sat, Apr 20, 2013 at 8:05 PM, Michael Heemskerk
>> <mheemskerk@atlassian.com> wrote:
>> > diff --git a/Documentation/technical/pack-protocol.txt
>> > b/Documentation/technical/pack-protocol.txt
>> > index f1a51ed..b898e97 100644
>> > --- a/Documentation/technical/pack-protocol.txt
>> > +++ b/Documentation/technical/pack-protocol.txt
>> > @@ -228,8 +228,7 @@ obtained through ref discovery.
>> ...
Previous: Michael HeemskerkNext: Junio C Hamano
Message 5 of 7 in “Re: [PATCH/RFC] upload-pack: ignore 'shallow' lines with unknown obj-ids”
  1. Duy NguyenApr 20, 2013
  2. Junio C HamanoApr 20, 2013
  3. Duy NguyenApr 20, 2013
  4. Fwd: [PATCH/RFC] upload-pack: ignore 'shallow' lines with unknown obj-idsMichael Heemskerk, Apr 21, 2013
  5. Junio C HamanoApr 29, 2013
  6. Junio C HamanoApr 29, 2013
  7. Michael HeemskerkApr 29, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.