1. 30 Jun, 2015 1 commit
  2. 29 Jun, 2015 1 commit
  3. 26 Jun, 2015 1 commit
  4. 22 Jun, 2015 3 commits
  5. 20 Jun, 2015 1 commit
    • tests: tick over five seconds instead of one · 863dd89a
      When ticking over one second, it can happen that the actual time ticks
      over the same second between the time that we undermine our own race
      protections and the time in which we perform the index update. Such
      timing would make the time in the entries match the index' timestamp and
      we have not gained anything.
      
      Ticking over five seconds makes it so that if real-time rolls over that
      second, our index is still ahead. This is still suboptimal as we're
      dealing with timing, but five seconds should be long enough for any
      reasonable test runner to finish the tests.
      Carlos Martín Nieto committed
  6. 17 Jun, 2015 1 commit
  7. 16 Jun, 2015 3 commits
  8. 12 Jun, 2015 1 commit
  9. 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
  10. 28 May, 2015 1 commit
  11. 26 May, 2015 1 commit
  12. 13 May, 2015 1 commit
    • Remove the callbacks struct from the remote · 8f0104ec
      Having the setting be different from calling its actions was not a great
      idea and made for the sake of the wrong convenience.
      
      Instead of that, accept either fetch options, push options or the
      callbacks when dealing with the remote. The fetch options are currently
      only the callbacks, but more options will be moved from setters and
      getters on the remote to the options.
      
      This does mean passing the same struct along the different functions but
      the typical use-case will only call git_remote_fetch() or
      git_remote_push() and so won't notice much difference.
      Carlos Martín Nieto committed
  13. 04 May, 2015 6 commits
  14. 06 Apr, 2015 1 commit
    • Fix git_checkout_tree() to do index filemodes correctly on Windows. · 67db2bde
      git_checkout_tree() has some fallback behaviors for file systems
      which don't have full support of filemodes.  Generally works fine,
      but if a given file had a change of type from a 0644 to 0755 (i.e.,
      you add executable permissions), the fallback behavior incorrectly
      triggers when writing hte updated index.
      
      This would cause a git_checkout_tree() command, even with the
      GIT_CHECKOUT_FORCE option set, to leave a dirty index on Windows.
      
      Also added checks to an existing test to catch this case.
      John Fultz committed
  15. 04 Apr, 2015 1 commit
  16. 25 Mar, 2015 1 commit
  17. 16 Mar, 2015 1 commit
  18. 03 Mar, 2015 5 commits
  19. 27 Feb, 2015 3 commits
  20. 14 Feb, 2015 1 commit
  21. 04 Feb, 2015 2 commits
  22. 03 Feb, 2015 2 commits
  23. 30 Jan, 2015 1 commit