On 4/24/07, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
On Mon, 23 Apr 2007, Martin Langhoff wrote: > The _really_ strange bit is that it was attempting to merge 2 heads of > the same name. It'd probably be something to block... No, "git-read-tree -m A B" is not a "merge" in the sense you're thinking, it's a "fast-forward merge", ie just a "move from A to B"
...
So when we move from one head to another, we do that two-way thing. And if A and B are the same, doesn't really do anything, but there's also no point to try to avoid doing it.
Yup - except that the logic in git-commit wasn't expecting this at all, so it never said "fast-forwarding" and most importantly, it changed the index, and the checked out files, but didn't update the head it was aiming for. There is definitely a bug when heads are ambiguous. Will try and find some time to fix it up in the coming days but I'm quite cornered with work here so if anyone wants to have a look at it... cheers, martin - 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