Jeff King <peff@xxxxxxxx> writes:
>> X - a - b - c - Y
>> / /
>> o - d - e - f
>
> In your example, git-merge-base X Y returns X. In fact, I could only get
> one merge base out of git-merge-base --all. I tried looking in the tests
> to find a case that produced multiple merge bases, but I was unable to
> find one. Is there an example floating around somewhere?
There are quite a few in git.git itself. In the recent history,
this counts 42, the answer to everything.
#!/bin/sh
LF='
'
git rev-list --parents master..next |
while read it p1 p2 octo
do
case "$p2" in '') continue ;; esac
mb=`git merge-base --all "$p1" "$p2"`
case "$mb" in ?*"$LF"?*) echo "$p1 $p2" : $mb ;;
esac
done
-
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