Hi, On Tue, Sep 09, 2008 at 05:52:37PM +0100, Russell King <rmk@xxxxxxxxxxxxxxxx> wrote: > Is this intentional, or is it a bug? It is because builtin-commit does not use reduce_heads(), but builtin-merge does. Here are 3 patches to make builtin-commit use commit_tree() and reduce_heads() as well. The first one just improves the commit_tree() interface. The second one is a cleanup, but it also adds reduce_heads() usage, to fix the issue, pointed out by Russell King. The third one adds new testcases, based on the ones provided by him. Miklos Vajna (3): commit_tree(): add a new author parameter builtin-commit: use commit_tree() t7603: add new testcases to ensure builtin-commit uses reduce_heads() builtin-commit-tree.c | 9 ++++-- builtin-commit.c | 63 +++++++++------------------------------- builtin-merge.c | 4 +- builtin.h | 3 +- t/t7603-merge-reduce-heads.sh | 53 ++++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 55 deletions(-) -- 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
