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

Re: [PATCH] Make git-prune submodule aware (and fix a SEGFAULT in the process)

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 17, 2007, 23:48 UTC
Message-ID
<7vtzqxen8b.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<alpine.LFD.0.999.0708170956140.30176@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
Show 32 quoted lines
> On Fri, 17 Aug 2007, Andy Parkins wrote:
>>
>> Could any of the guru's give me a guide to upload-pack.c?  I assume the 
>> problem is going to be the same as it was for git-prune, the hash for the 
>> gitlink object in the tree is being assumed to be an object in the ODB; 
>> which isn't the case with gitlink entries.  Where would that be happening 
>> in git-upload-pack?  The fix is going to be..
>> 
>>  if( S_ISGITLINK(mode))
>>       continue;
>> 
>> But I've got no idea where to put it :-)
>
> Maybe this one?
>
> ---
>  builtin-pack-objects.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
> index 24926db..77481df 100644
> --- a/builtin-pack-objects.c
> +++ b/builtin-pack-objects.c
> @@ -979,6 +979,8 @@ static void add_pbase_object(struct tree_desc *tree,
>  	int cmp;
>  
>  	while (tree_entry(tree,&entry)) {
> +		if (S_ISGITLINK(entry.mode))
> +			continue;
>  		cmp = tree_entry_len(entry.path, entry.sha1) != cmplen ? 1 :
>  		      memcmp(name, entry.path, cmplen);
>  		if (cmp > 0)
This sounds very plausible.

Andy, in the repository your fetch fails, if a fetch-pack without "--thin" before Linus's patch does not barf, that strongly suggests that the breakage you are seeing is related to this codepath. And with Linus's patch, "fetch-pack --thin" would also be fixed.

Previous: Linus TorvaldsNext: Andy Parkins
Message 6 of 8 in “Make git-prune submodule aware (and fix a SEGFAULT in the process)”
  1. Make git-prune submodule aware (and fix a SEGFAULT in the process)Andy Parkins, Jul 2, 2007
  2. Junio C HamanoJul 2, 2007
  3. Andy ParkinsAug 17, 2007
  4. Johannes SixtAug 17, 2007
  5. Linus TorvaldsAug 17, 2007
  6. Junio C HamanoAug 17, 2007
  7. Andy ParkinsAug 20, 2007
  8. Make thin-pack generation subproject aware.Junio C Hamano, Aug 18, 2007

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.