Miklos Vajna wrote: > 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. Unfortunately it does not really work yet, since the files only present on the second branch are not added. I do get Trying really trivial in-index merge... Wonderful. In-index merge but then "git status" gives: # On branch master # Untracked files: # (use "git add <file>..." to include in what will be committed) # # b (in my testcase for pre-merge, this results in a failure of the "octopus" testcase). Paolo -- 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
