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
- [RFC PATCH 0/7] merge requirement: index matches head Elijah Newren
- [RFC PATCH 2/7] t6044: add a testcase for index matc... Elijah Newren
- [RFC PATCH 4/7] merge-recursive: fix assumption that... Elijah Newren
- Re: [RFC PATCH 4/7] merge-recursive: fix assumpt... Ramsay Jones
- Re: [RFC PATCH 4/7] merge-recursive: fix ass... brian m. carlson
- Re: [RFC PATCH 4/7] merge-recursive: fix... Ramsay Jones
- Re: [RFC PATCH 4/7] merge-recursive: fix assumpt... Junio C Hamano
- Re: [RFC PATCH 4/7] merge-recursive: fix ass... Elijah Newren
- Re: [RFC PATCH 4/7] merge-recursive: fix... Elijah Newren
- [RFC PATCH 6/7] merge-recursive: enforce rule that i... Elijah Newren
- [RFC PATCH 5/7] t6044: add more testcases with stage... Elijah Newren
- [RFC PATCH 1/7] t6044: verify that merges expected t... Elijah Newren
- [RFC PATCH 3/7] merge-recursive: make sure when we s... Elijah Newren
- [RFC PATCH 7/7] merge: fix misleading pre-merge chec... Elijah Newren
- Re: [RFC PATCH 7/7] merge: fix misleading pre-me... Elijah Newren
- [PATCH v2 0/9] Fix merge issues with index not match... Elijah Newren