thodg/libgit2/src

Diff

  • Show log

    Commit

  • Hash : 813f0802
    Author : Edward Thomson
    Date : 2018-07-01T15:14:36 

    apply: validate workdir contents match index for BOTH

When applying to both the index and the working directory, ensure that
the index contents match the working directory.  This mirrors the
requirement in `git apply --index`.

This also means that - along with the prior commit that uses the working
directory contents as the checkout baseline - we no longer expect
conflicts during checkout.  So remove the special-case error handling
for checkout conflicts.  (Any checkout conflict now would be because the
file was actually modified between the start of patch application and
the checkout.)

kmx.io     mail     discord kmxgit v0.4.0