Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes: > There were 3 issues: > > 1) We need read_cache() before using unpack_trees(). > > 2) commit_tree() frees the parents, so we need to malloc them. > > 3) The current HEAD was missing from the parent list. > > Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> > --- > > On Fri, Aug 22, 2008 at 08:36:39AM +0200, Paolo Bonzini <bonzini@xxxxxxx> wrote: >> I had already posted this bug report yesterday but it was hidden in a >> cover >> letter at >> http://permalink.gmane.org/gmane.comp.version-control.git/93143 > > This should fix the issue. > > builtin-merge.c | 11 +++++++---- > t/t7607-merge-inindex.sh | 29 +++++++++++++++++++++++++++++ > 2 files changed, 36 insertions(+), 4 deletions(-) > create mode 100755 t/t7607-merge-inindex.sh Please do not add new testfiles unnecessarily. You already have test scripts that cover "git-merge". Add new ones to them. The same comment goes to the other patch. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
