1. 23 Jan, 2017 1 commit
  2. 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
  3. 30 Aug, 2016 1 commit
    • git_checkout_tree options fix · 88cfe614
      According to the reference the git_checkout_tree and git_checkout_head
      functions should accept NULL in the opts field
      
      This was broken since the opts field was dereferenced and thus lead to a
      crash.
      Stefan Huber committed
  4. 15 Jun, 2016 1 commit
  5. 16 Sep, 2015 5 commits
  6. 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
  7. 28 May, 2015 1 commit
  8. 04 May, 2015 4 commits
  9. 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
  10. 03 Mar, 2015 4 commits
  11. 27 Feb, 2015 3 commits
  12. 14 Feb, 2015 1 commit
  13. 04 Feb, 2015 1 commit
  14. 03 Feb, 2015 1 commit
  15. 20 Jan, 2015 1 commit
  16. 04 Jan, 2015 1 commit
  17. 23 Dec, 2014 2 commits
  18. 23 Nov, 2014 1 commit
  19. 06 Nov, 2014 1 commit
  20. 03 Aug, 2014 1 commit
  21. 06 Mar, 2014 1 commit
  22. 03 Feb, 2014 1 commit
  23. 30 Jan, 2014 2 commits
  24. 25 Jan, 2014 1 commit
  25. 22 Jan, 2014 1 commit
  26. 15 Jan, 2014 1 commit