{"thread":{"id":"149","subject":"Bug in merge-base","startedAt":"2005-04-19T21:31:43Z","lastAt":"2005-04-19T21:31:43Z","messageCount":1,"participants":["Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"869","messageId":"20050419213143.GC9305@pasky.ji.cz","threadId":"149","inReplyTo":null,"subject":"Bug in merge-base","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-19T21:31:43Z","receivedAt":"2005-04-19T21:31:43Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"  Hello,\n\n  I've hit a strange bug in merge-base I don't want to debug now. ;-)\nI've been doing my regular git pull test from my main branch, but\nsuddenly git merge wanted to do a tree merge instead of fast-forward.\nWhat went wrong?\n\n  The commits tree looks like:\n\n  36c764 -- 808162 -- ...... -- 8e08e7\n  5b53d3 -'\n\n(see the rev-tree output at\nhttp://pasky.or.cz/~pasky/dev/git/stuff/rev-tree)\n\n  The problem is, merge-base hints me wrong:\n\n  $ merge-base 8e08e7 808162\n5b53d3\n\ninstead of 808162.\n\n  Thanks,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"}]}