thodg/libgit2/tests/merge

Diff

  • Show log

    Commit

  • Hash : b3c0d43c
    Author : Tyrie Vella
    Date : 2018-01-22T14:44:31 

    merge: virtual commit should be last argument to merge-base

Our virtual commit must be the last argument to merge-base: since our
algorithm pushes _both_ parents of the virtual commit, it needs to be
the last argument, since merge-base:

> Given three commits A, B and C, git merge-base A B C will compute the
> merge base between A and a hypothetical commit M

We want to calculate the merge base between the actual commit ("two")
and the virtual commit ("one") - since one actually pushes its parents
to the merge-base calculation, we need to calculate the merge base of
"two" and the parents of one.

kmx.io     mail     discord kmxgit v0.4.0