1. 01 Oct, 2016 3 commits
  2. 12 Feb, 2016 1 commit
  3. 01 Dec, 2015 1 commit
  4. 20 Nov, 2015 1 commit
  5. 17 Nov, 2015 1 commit
    • checkout::crlf test: don't crash when no idx entry · de999f26
      When there's no matching index entry (for whatever reason), don't
      try to dereference the null return value to get at the id.
      
      Otherwise when we break something in the index API, the checkout
      test crashes for confusing reasons and causes us to step through
      it in a debugger thinking that we had broken much more than we
      actually did.
      Edward Thomson committed
  6. 19 Sep, 2015 1 commit
  7. 17 Sep, 2015 1 commit
    • git_futils_mkdir_*: make a relative-to-base mkdir · ac2fba0e
      Untangle git_futils_mkdir from git_futils_mkdir_ext - the latter
      assumes that we own everything beneath the base, as if it were
      being called with a base of the repository or working directory,
      and is tailored towards checkout and ensuring that there is no
      bogosity beneath the base that must be cleaned up.
      
      This is (at best) slow and (at worst) unsafe in the larger context
      of a filesystem where we do not own things and cannot do things like
      unlink symlinks that are in our way.
      Edward Thomson committed
  8. 16 Sep, 2015 5 commits
  9. 30 Jun, 2015 1 commit
  10. 29 Jun, 2015 1 commit
  11. 26 Jun, 2015 1 commit
  12. 22 Jun, 2015 3 commits
  13. 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
  14. 17 Jun, 2015 1 commit
  15. 16 Jun, 2015 3 commits
  16. 12 Jun, 2015 1 commit
  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 1 commit
  19. 26 May, 2015 1 commit
  20. 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
  21. 04 May, 2015 6 commits
  22. 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
  23. 04 Apr, 2015 1 commit
  24. 25 Mar, 2015 1 commit
  25. 16 Mar, 2015 1 commit