Ouch. That makes me suspicious. One reason git-merge-base is slow is
because it's being pretty careful about some pathological examples of
dates being just the wrong way around, and it might just be that the
reason git-show-branch is faster is because it isn't doing that part
right.
So yes, git-merge-base does extra work, but it does so because I think it
needs to.
Junio? You even wrote the comment about the case in git-merge-base, I'm
wondering whether it's a bug that we use the fast-and-cheap algorithm in
git-show-branch..
Of course, arguably you can first try the fast-and-cheap thing, and if
that gives a merge parent that is acceptable, why not? So maybe it's the
right thing for the "let's see if this is trivial" case, but I think it
might _think_ some cases are trivial that really shouldn't, because they
actually have two merge parents.
Linus
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
