1. 03 Jan, 2018 1 commit
    • tests: status::worktree: indicate skipped tests on Win32 · 72c28ab0
      Some function bodies of tests which are not applicable to the Win32
      platform are completely #ifdef'd out instead of calling `cl_skip()`.
      This leaves us with no indication that these tests are not being
      executed at all and may thus cause decreased scrutiny when investigating
      skipped tests. Improve the situation by calling `cl_skip()` instead of
      just doing nothing.
      Patrick Steinhardt committed
  2. 09 Oct, 2017 2 commits
  3. 07 Oct, 2017 1 commit
  4. 10 Jun, 2017 1 commit
  5. 10 Apr, 2017 1 commit
  6. 23 Jan, 2017 1 commit
  7. 30 Dec, 2016 1 commit
    • Fix handling of GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH flag. · 5f959dca
      git_checkout_tree() sets up its working directory iterator to respect the
      pathlist if GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH is present, which is great.
      What's not so great is that this iterator is then used side-by-side with
      an iterator created by git_checkout_iterator(), which did not set up its
      pathlist appropriately (although the iterator mirrors all other iterator
      options).
      
      This could cause git_checkout_tree() to delete working tree files which
      were not specified in the pathlist when GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH
      was used, as the unsynchronized iterators causes git_checkout_tree() to think
      that files have been deleted between the two trees.  Oops.
      
      And added a test which fails without this fix (specifically, the final check
      for "testrepo/README" to still be present fails).
      John Fultz committed
  8. 30 Aug, 2016 1 commit
  9. 15 Jun, 2016 1 commit
  10. 07 Jun, 2016 1 commit
  11. 01 Jun, 2016 1 commit
  12. 26 May, 2016 1 commit
  13. 24 May, 2016 1 commit
  14. 12 Feb, 2016 1 commit
  15. 01 Dec, 2015 1 commit
  16. 20 Nov, 2015 1 commit
  17. 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
  18. 19 Sep, 2015 1 commit
  19. 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
  20. 16 Sep, 2015 5 commits
  21. 30 Jun, 2015 1 commit
  22. 29 Jun, 2015 1 commit
  23. 26 Jun, 2015 1 commit
  24. 22 Jun, 2015 3 commits
  25. 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
  26. 17 Jun, 2015 1 commit
  27. 16 Jun, 2015 3 commits
  28. 12 Jun, 2015 1 commit
  29. 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
  30. 28 May, 2015 1 commit
  31. 26 May, 2015 1 commit