git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Derrick Stolee <stolee@gmail.com>
To: Stefan Beller <sbeller@google.com>, git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH v2 05/31] tree: add repository argument to lookup_tree
Date: Thu, 14 Jun 2018 15:33:32 -0400	[thread overview]
Message-ID: <709bd61c-70fc-a925-efba-58ab9be265c9@gmail.com> (raw)
In-Reply-To: <fcb052e0-2308-31bd-aa90-d6d3327642c0@gmail.com>

On 6/14/2018 1:55 PM, Derrick Stolee wrote:
> On 6/13/2018 7:04 PM, Stefan Beller wrote:
>> diff --git a/commit-graph.c b/commit-graph.c
>> index 71125d7cbb6..88a4b0d2a47 100644
>> --- a/commit-graph.c
>> +++ b/commit-graph.c
>> @@ -261,7 +261,7 @@ static int fill_commit_in_graph(struct commit 
>> *item, struct commit_graph *g, uin
>>       item->graph_pos = pos;
>>         hashcpy(oid.hash, commit_data);
>> -    item->tree = lookup_tree(&oid);
>> +    item->tree = lookup_tree(the_repository, &oid);
>>         date_high = get_be32(commit_data + g->hash_len + 8) & 0x3;
>>       date_low = get_be32(commit_data + g->hash_len + 12);
>> diff --git a/commit.c b/commit.c
>> index d76d64d4dfc..755b8b9d94f 100644
>> --- a/commit.c
>> +++ b/commit.c
>> @@ -354,7 +354,7 @@ int parse_commit_buffer(struct commit *item, 
>> const void *buffer, unsigned long s
>>       if (get_sha1_hex(bufptr + 5, parent.hash) < 0)
>>           return error("bad tree pointer in commit %s",
>>                    oid_to_hex(&item->object.oid));
>> -    item->tree = lookup_tree(&parent);
>> +    item->tree = lookup_tree(the_repository, &parent);
>>       bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
>>       pptr = &item->parents;
>>   diff --git a/fsck.c b/fsck.c
>> index 2d372f2a3f3..b07abb9796c 100644
>
> I'm a bit late here, but you don't have ds/lazy-load-trees merged in 
> your history, so this will conflict with 'master'. I caught this as I 
> was trying to merge ds/generation-numbers with your branch.
>
> The 'tree' member of 'struct commit' was renamed to 'maybe_tree'.

Resolving the merge was not very simple. I have a working merge 
available on GitHub [1] as commit 99a899f7c12ef73840dbe79c71acb11034d707dd.

Thanks,
-Stolee

[1] 
https://github.com/derrickstolee/git/commits/generation-numbers-object-store

  reply	other threads:[~2018-06-14 19:33 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-30  0:47 [RFC PATCH 00/35] object-store: lookup_commit Stefan Beller
2018-05-30  0:47 ` [PATCH 01/35] object: add repository argument to parse_object Stefan Beller
2018-05-30  0:47 ` [PATCH 02/35] object: add repository argument to lookup_object Stefan Beller
2018-05-30  0:47 ` [PATCH 03/35] object: add repository argument to lookup_unknown_object Stefan Beller
2018-05-30 18:29   ` Derrick Stolee
2018-06-06 19:38   ` Duy Nguyen
2018-06-13 19:30     ` Stefan Beller
2018-06-14  1:17       ` Derrick Stolee
2018-05-30  0:47 ` [PATCH 04/35] object: add repository argument to parse_object_buffer Stefan Beller
2018-05-30 18:34   ` Derrick Stolee
2018-05-30  0:47 ` [PATCH 05/35] object: add repository argument to object_as_type Stefan Beller
2018-05-30  0:47 ` [PATCH 06/35] blob: add repository argument to lookup_blob Stefan Beller
2018-05-30 18:36   ` Derrick Stolee
2018-05-30  0:47 ` [PATCH 07/35] tree: add repository argument to lookup_tree Stefan Beller
2018-06-06 19:26   ` Duy Nguyen
2018-05-30  0:47 ` [PATCH 08/35] commit: add repository argument to lookup_commit_reference_gently Stefan Beller
2018-05-30  0:47 ` [PATCH 09/35] commit: add repository argument to lookup_commit_reference Stefan Beller
2018-05-30  0:47 ` [PATCH 10/35] commit: add repository argument to lookup_commit Stefan Beller
2018-06-14 16:22   ` Duy Nguyen
2018-06-14 21:15     ` Stefan Beller
2018-06-14 21:24       ` Brandon Williams
2018-05-30  0:47 ` [PATCH 11/35] commit: add repository argument to parse_commit_buffer Stefan Beller
2018-05-30  0:47 ` [PATCH 12/35] commit: add repository argument to set_commit_buffer Stefan Beller
2018-05-30  0:47 ` [PATCH 13/35] commit: add repository argument to get_cached_commit_buffer Stefan Beller
2018-05-30  0:47 ` [PATCH 14/35] tag: add repository argument to lookup_tag Stefan Beller
2018-05-30  0:47 ` [PATCH 15/35] tag: add repository argument to parse_tag_buffer Stefan Beller
2018-05-30  0:47 ` [PATCH 16/35] tag: add repository argument to deref_tag Stefan Beller
2018-05-30  0:47 ` [PATCH 17/35] object: add repository argument to parse_commit_gently Stefan Beller
2018-05-30  0:47 ` [PATCH 18/35] commit: add repository argument to parse_commit Stefan Beller
2018-05-30  0:47 ` [PATCH 19/35] object: allow object_as_type to handle arbitrary repositories Stefan Beller
2018-05-30  0:47 ` [PATCH 20/35] object: allow lookup_object " Stefan Beller
2018-05-30  0:47 ` [PATCH 21/35] blob: allow lookup_blob " Stefan Beller
2018-05-30  0:47 ` [PATCH 22/35] tree: allow lookup_tree " Stefan Beller
2018-05-30  0:47 ` [PATCH 23/35] commit: allow lookup_commit " Stefan Beller
2018-05-30  0:47 ` [PATCH 24/35] tag: allow lookup_tag " Stefan Beller
2018-05-30  0:48 ` [PATCH 25/35] tag: allow parse_tag_buffer " Stefan Beller
2018-05-30  0:48 ` [PATCH 26/35] commit.c: allow parse_commit_buffer " Stefan Beller
2018-05-30  0:48 ` [PATCH 27/35] commit-slabs: remove realloc counter outside of slab struct Stefan Beller
2018-05-30 19:00   ` Derrick Stolee
2018-05-30  0:48 ` [PATCH 28/35] commit.c: migrate the commit buffer to the parsed object store Stefan Beller
2018-06-06 19:31   ` Duy Nguyen
2018-06-13 20:55     ` Stefan Beller
2018-05-30  0:48 ` [PATCH 29/35] commit.c: allow set_commit_buffer to handle arbitrary repositories Stefan Beller
2018-05-30  0:48 ` [PATCH 30/35] commit.c: allow get_cached_commit_buffer " Stefan Beller
2018-05-30  0:48 ` [PATCH 31/35] object.c: allow parse_object_buffer " Stefan Beller
2018-05-30  0:48 ` [PATCH 32/35] object.c: allow parse_object " Stefan Beller
2018-05-30  0:48 ` [PATCH 33/35] tag.c: allow deref_tag " Stefan Beller
2018-05-30  0:48 ` [PATCH 34/35] commit.c: allow lookup_commit_reference_gently " Stefan Beller
2018-05-30  0:48 ` [PATCH 35/35] commit.c: allow lookup_commit_reference " Stefan Beller
2018-05-30  1:05 ` [RFC PATCH 00/35] object-store: lookup_commit Derrick Stolee
2018-05-30  3:18   ` Stefan Beller
2018-05-30 19:18     ` Derrick Stolee
2018-05-30 22:19       ` Stefan Beller
2018-06-13 23:04 ` [PATCH v2 00/31] " Stefan Beller
2018-06-13 23:04   ` [PATCH v2 01/31] object: add repository argument to lookup_object Stefan Beller
2018-06-13 23:04   ` [PATCH v2 02/31] object: add repository argument to parse_object_buffer Stefan Beller
2018-06-13 23:04   ` [PATCH v2 03/31] object: add repository argument to object_as_type Stefan Beller
2018-06-13 23:04   ` [PATCH v2 04/31] blob: add repository argument to lookup_blob Stefan Beller
2018-06-13 23:04   ` [PATCH v2 05/31] tree: add repository argument to lookup_tree Stefan Beller
2018-06-14 17:55     ` Derrick Stolee
2018-06-14 19:33       ` Derrick Stolee [this message]
2018-06-14 21:31         ` Stefan Beller
2018-06-13 23:04   ` [PATCH v2 06/31] commit: add repository argument to lookup_commit_reference_gently Stefan Beller
2018-06-13 23:04   ` [PATCH v2 07/31] commit: add repository argument to lookup_commit_reference Stefan Beller
2018-06-13 23:04   ` [PATCH v2 08/31] commit: add repository argument to lookup_commit Stefan Beller
2018-06-13 23:05   ` [PATCH v2 09/31] commit: add repository argument to parse_commit_buffer Stefan Beller
2018-06-13 23:05   ` [PATCH v2 10/31] commit: add repository argument to set_commit_buffer Stefan Beller
2018-06-13 23:05   ` [PATCH v2 11/31] commit: add repository argument to get_cached_commit_buffer Stefan Beller
2018-06-13 23:05   ` [PATCH v2 12/31] tag: add repository argument to lookup_tag Stefan Beller
2018-06-13 23:05   ` [PATCH v2 13/31] tag: add repository argument to parse_tag_buffer Stefan Beller
2018-06-13 23:05   ` [PATCH v2 14/31] tag: add repository argument to deref_tag Stefan Beller
2018-06-13 23:05   ` [PATCH v2 15/31] object: allow object_as_type to handle arbitrary repositories Stefan Beller
2018-06-13 23:05   ` [PATCH v2 16/31] object: allow lookup_object " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 17/31] blob: allow lookup_blob " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 18/31] tree: allow lookup_tree " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 19/31] commit: allow lookup_commit " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 20/31] tag: allow lookup_tag " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 21/31] tag: allow parse_tag_buffer " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 22/31] commit.c: allow parse_commit_buffer " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 23/31] commit-slabs: remove realloc counter outside of slab struct Stefan Beller
2018-06-13 23:05   ` [PATCH v2 24/31] commit.c: migrate the commit buffer to the parsed object store Stefan Beller
2018-06-13 23:05   ` [PATCH v2 25/31] commit.c: allow set_commit_buffer to handle arbitrary repositories Stefan Beller
2018-06-13 23:05   ` [PATCH v2 26/31] commit.c: allow get_cached_commit_buffer " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 27/31] object.c: allow parse_object_buffer " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 28/31] object.c: allow parse_object " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 29/31] tag.c: allow deref_tag " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 30/31] commit.c: allow lookup_commit_reference_gently " Stefan Beller
2018-06-13 23:05   ` [PATCH v2 31/31] commit.c: allow lookup_commit_reference " Stefan Beller
2018-06-14  1:23   ` [PATCH v2 00/31] object-store: lookup_commit Derrick Stolee
2018-06-14  1:42     ` Derrick Stolee
2018-06-14 16:26   ` Duy Nguyen
2018-06-14 18:27   ` Brandon Williams

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=709bd61c-70fc-a925-efba-58ab9be265c9@gmail.com \
    --to=stolee@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=sbeller@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).