Re: [PATCH v2 05/31] tree: add repository argument to lookup_tree

2018-06-14 Thread Stefan Beller
On Thu, Jun 14, 2018 at 12:33 PM Derrick Stolee wrote: > > 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 for pointing this

Re: [PATCH v2 05/31] tree: add repository argument to lookup_tree

2018-06-14 Thread Derrick Stolee
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

Re: [PATCH v2 05/31] tree: add repository argument to lookup_tree

2018-06-14 Thread Derrick Stolee
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 =

[PATCH v2 05/31] tree: add repository argument to lookup_tree

2018-06-13 Thread Stefan Beller
Add a repository argument to allow the callers of lookup_tree to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch