thodg/libgit2/src

Diff

  • Show log

    Commit

  • Hash : 89776585
    Author : Carlos Martín Nieto
    Date : 2016-11-14T12:44:52 

    tree: look for conflicts in the new tree when updating

We look at whether we're trying to replace a blob with a tree during the
update phase, but we fail to look at whether we've just inserted a blob
where we're now trying to insert a tree.

Update the check to look at both places. The test for this was
previously succeeding due to the bu where we did not look at the sorted
output.

kmx.io     mail     discord kmxgit v0.4.0