Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> writes: > On Tue, Jun 03, 2008 at 07:40:21AM -0700, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: >> Right. But git shouldn't do duplicate parents. I agree it's a mis-use of >> git merge, but either we should have errored out or we should have pruned >> the parents. >> >> Yes, the end result is "tecnically correct", but it's not optimal. > > I think the current git-merge.sh already handles this: 6ea23343 > introduced the usage of git-show-branch --independent to filter out > duplicated parents. Good eyes. I guess I was sloppy when I wrote the log message for that one and failed to talk about the bugfix ;-). -- 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
