> +/* Remember to update object flag allocation in object.h */ > +#define PARENT1 (1u<<16) > +#define PARENT2 (1u<<17) > +#define STALE (1u<<18) > +#define RESULT (1u<<19)
Update object.h to point to commit-reach.c instead of commit.c also. > diff --git a/commit-reach.h b/commit-reach.h > new file mode 100644 > index 000000000..244f48c5f > --- /dev/null > +++ b/commit-reach.h > @@ -0,0 +1,41 @@ > +#ifndef __COMMIT_REACH_H__ > +#define __COMMIT_REACH_H__ > + > +#include "commit.h" > + > +struct commit_list *get_merge_bases_many(struct commit *one, > + int n, > + struct commit **twos); <snip> Should the declarations in commit.h be deleted also? Thanks for copying it over verbatim - it makes it much easier to see what's going on with --color-moved.
