thodg/libgit2/tests/merge

Diff

  • Show log

    Commit

  • Hash : 5b05f954
    Author : Carlos Martín Nieto
    Date : 2015-06-20T13:17:06 

    merge: work around write-side racy protection when hacking the index

As we attempt to replicate a situation in which an older checkout has
put a file on disk with different filtering settings from us, set the
timestamp on the entry and file to a second before we're performing the
operation so the entry in the index counts as old.

This way we can test that we're not looking at the on-disk file when the
index has the entry and we detect it as clean.

kmx.io     mail     discord kmxgit v0.4.0