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

Re: [PATCH] fetch-pack: fix object_id of exact sha1

From
Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
Date
Feb 27, 2016, 22:23 UTC
Message-ID
<CABaesJJCfd6FzgEVCWMJH8-gKiv3pT8BGq4f-qFgprVde+ViQQ@mail.gmail.com>
In-Reply-To
<20160227221248.GB17475@sigill.intra.peff.net>
On Sat, Feb 27, 2016 at 7:12 PM, Jeff King <peff@peff.net> wrote:
Show 38 quoted lines
> On Sat, Feb 27, 2016 at 05:32:54PM -0300, Gabriel Souza Franco wrote:
>
>> Commit 58f2ed0 (remote-curl: pass ref SHA-1 to fetch-pack as well,
>> 2013-12-05) added support for specifying a SHA-1 as well as a ref name.
>> Add support for specifying just a SHA-1 and set the ref name to the same
>> value in this case.
>>
>> Signed-off-by: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
>> ---
>>  builtin/fetch-pack.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
>> index 79a611f..d7e439a 100644
>> --- a/builtin/fetch-pack.c
>> +++ b/builtin/fetch-pack.c
>> @@ -16,10 +16,10 @@ static void add_sought_entry(struct ref ***sought, int *nr, int *alloc,
>>       struct ref *ref;
>>       struct object_id oid;
>>
>> -     if (!get_oid_hex(name, &oid) && name[GIT_SHA1_HEXSZ] == ' ')
>> -             name += GIT_SHA1_HEXSZ + 1;
>> -     else
>> +     if (get_oid_hex(name, &oid))
>>               oidclr(&oid);
>> +     else if (name[GIT_SHA1_HEXSZ] == ' ')
>> +             name += GIT_SHA1_HEXSZ + 1;
>
> This makes sense to me. I wonder if we should be more particular about
> the pure-sha1 case consuming the whole string, though. E.g., if we get:
>
>   1234567890123456789012345678901234567890-bananas
>
> that should probably not have sha1 1234...
>
> I don't think it should ever really happen in practice, but it might be
> worth noticing and complaining when name[GIT_SHA1_HEXSZ] is neither
> space nor '\0'.

Right. What kind of complaining? Is doing oidclr(&oid) and letting it fail elsewhere enough? Also, it already fails precisely because of that check I wanted to remove earlier.

>
> -Peff
Previous: Jeff KingNext: Junio C Hamano
Message 10 of 28 in “fetch-pack: fix unadvertised requests validation”
  1. fetch-pack: fix unadvertised requests validationGabriel Souza Franco, Feb 27, 2016
  2. Junio C HamanoFeb 27, 2016
  3. Junio C HamanoFeb 27, 2016
  4. Junio C HamanoFeb 27, 2016
  5. Jeff KingFeb 27, 2016
  6. Jeff KingFeb 27, 2016
  7. Gabriel Souza FrancoFeb 27, 2016
  8. fetch-pack: fix object_id of exact sha1Gabriel Souza Franco, Feb 27, 2016
  9. Jeff KingFeb 27, 2016
  10. Gabriel Souza FrancoFeb 27, 2016
  11. Junio C HamanoFeb 28, 2016
  12. fetch-pack: fix object_id of exact sha1Gabriel Souza Franco, Feb 28, 2016
  13. Johannes SchindelinFeb 29, 2016
  14. Jeff KingFeb 29, 2016
  15. Gabriel Souza FrancoMar 1, 2016
  16. fetch-pack: fix object_id of exact sha1Gabriel Souza Franco, Mar 1, 2016
  17. Jeff KingMar 1, 2016
  18. Gabriel Souza FrancoMar 3, 2016
  19. Jeff KingMar 4, 2016
  20. fetch-pack: fix object_id of exact sha1Gabriel Souza Franco, Mar 5, 2016
  21. Jeff KingMar 5, 2016
  22. Junio C HamanoMar 5, 2016
  23. fetch-pack: update the documentation for "<refs>..." argumentsGabriel Souza Franco, Mar 5, 2016
  24. Junio C HamanoMar 5, 2016
  25. Jeff KingMar 1, 2016
  26. Jeff KingFeb 29, 2016
  27. Jeff KingFeb 27, 2016
  28. Junio C HamanoFeb 28, 2016

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.