From: Ramsay Jones <ramsay@ramsayjones.plus.com>
Date: Mon, 04 Jun 2018 02:26:49 GMT
Subject: Re: [RFC PATCH 4/7] merge-recursive: fix assumption that head tree being merged is HEAD
Message-ID: <00bc05ba-da77-716f-94f5-c414d6020608@ramsayjones.plus.com>
In-Reply-To: <20180603233747.GB288937@genre.crustytoothpaste.net>



On 04/06/18 00:37, brian m. carlson wrote:
> On Sun, Jun 03, 2018 at 02:52:12PM +0100, Ramsay Jones wrote:
>> On 03/06/18 07:58, Elijah Newren wrote:
>>> I'm really unsure where the index_has_changes() declaration should go;
>>> I stuck it in tree.h, but is there a better spot?
>>
>> Err, leave it where it is and '#include "tree.h"' ? :-D
> 
> Or leave it where it is and use a forward structure declaration?

Indeed, I had intended to mention that possibility as well.

[Note: the "merge-recursive.h" header file references several
'struct tree *' parameters, but does not itself include a
declaration/definition from any source. So, in all of the six
files that #include it, it relies on a previous #include to
provide such a declaration/definition. I haven't checked, but
I think that it is usually provided by the "commit.h" header (even
on the single occasion that "tree.h" was included!).]


ATB,
Ramsay Jones