thodg/libgit2/tests/index

Diff

  • Show log

    Commit

  • Hash : 21515f22
    Author : Edward Thomson
    Date : 2015-09-29T15:49:16 

    index: also try conflict mode when inserting

When we do not trust the on-disk mode, we use the mode of an existing
index entry.  This allows us to preserve executable bits on platforms
that do not honor them on the filesystem.

If there is no stage 0 index entry, also look at conflicts to attempt
to answer this question:  prefer the data from the 'ours' side, then
the 'theirs' side before falling back to the common ancestor.

kmx.io     mail     discord kmxgit v0.4.0