1. 28 Jul, 2015 1 commit
  2. 27 Jul, 2015 2 commits
  3. 20 Jul, 2015 1 commit
  4. 12 Jul, 2015 2 commits
  5. 10 Jul, 2015 1 commit
  6. 03 Jul, 2015 1 commit
  7. 01 Jul, 2015 2 commits
  8. 30 Jun, 2015 1 commit
  9. 28 Jun, 2015 1 commit
  10. 25 Jun, 2015 2 commits
  11. 24 Jun, 2015 4 commits
  12. 22 Jun, 2015 10 commits
  13. 19 Jun, 2015 1 commit
    • index: use the checksum to check whether it's been modified · 5e947c91
      We currently use a timetamp to check whether an index file has been
      modified since we last read it, but this is racy. If two updates happen
      in the same second and we read after the first one, we won't detect the
      second one.
      
      Instead read the SHA-1 checksum of the file, which are its last 20 bytes which
      gives us a sure-fire way to detect whether the file has changed since we
      last read it.
      
      As we're now keeping track of it, expose an accessor to this data.
      Carlos Martín Nieto committed
  14. 12 Jun, 2015 1 commit
  15. 10 Jun, 2015 1 commit
  16. 31 May, 2015 2 commits
  17. 29 May, 2015 1 commit
    • Rename GIT_EMERGECONFLICT to GIT_ECONFLICT · 885b94aa
      We do not error on "merge conflicts"; on the contrary, merge conflicts
      are a normal part of merging.  We only error on "checkout conflicts",
      where a change exists in the index or the working directory that would
      otherwise be overwritten by performing the checkout.
      
      This *may* happen during merge (after the production of the new index
      that we're going to checkout) but it could happen during any checkout.
      Edward Thomson committed
  18. 28 May, 2015 6 commits