1. 01 Dec, 2018 1 commit
  2. 13 Jul, 2018 1 commit
    • treewide: remove use of C++ style comments · 9994cd3f
      C++ style comment ("//") are not specified by the ISO C90 standard and
      thus do not conform to it. While libgit2 aims to conform to C90, we did
      not enforce it until now, which is why quite a lot of these
      non-conforming comments have snuck into our codebase. Do a tree-wide
      conversion of all C++ style comments to the supported C style comments
      to allow us enforcing strict C90 compliance in a later commit.
      Patrick Steinhardt committed
  3. 06 Jul, 2018 1 commit
  4. 18 Jun, 2018 1 commit
  5. 11 Jun, 2018 1 commit
  6. 10 Jun, 2018 2 commits
  7. 06 Jun, 2018 1 commit
    • Fix stash save bug with fast path index check · 5a7d454b
      If the index contains stat data for a modified file, and the file is
      not racily dirty, and there exists an untracked working tree directory
      alphabetically after that file, and there are no other changes to the
      repo, then git_stash_save would fail. It would confuse the untracked
      working tree directory for the modified file, because they have the
      same sha: zero.  The wt directory has a sha of zero because it's a
      directory, and the file would have a zero sha because we wouldn't read
      the file -- we would just know that it doesn't match the index.  To
      fix this confusion, we simply check mode as well as SHA.
      David Turner committed
  8. 29 Jun, 2015 1 commit
  9. 26 Jun, 2015 1 commit
  10. 25 Jun, 2015 3 commits
  11. 23 Jun, 2015 1 commit
  12. 20 Jun, 2015 1 commit
  13. 02 Jun, 2015 1 commit
  14. 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
  15. 13 May, 2015 1 commit
  16. 11 May, 2015 7 commits
  17. 03 Mar, 2015 2 commits
  18. 18 Feb, 2015 1 commit
  19. 03 Oct, 2014 1 commit
  20. 24 Sep, 2014 1 commit
  21. 18 Aug, 2014 1 commit
  22. 01 Jul, 2014 1 commit
  23. 23 Apr, 2014 1 commit
    • Make checkout match diff for untracked/ignored dir · 37da3685
      When diff finds an untracked directory, it emulates Git behavior
      by looking inside the directory to see if there are any untracked
      items inside it. If there are only ignored items inside the dir,
      then diff considers it ignored, even if there is no direct ignore
      rule for it.
      
      Checkout was not copying this behavior - when it found an untracked
      directory, it just treated it as untracked.  Unfortunately, when
      combined with GIT_CHECKOUT_REMOVE_UNTRACKED, this made is seem that
      checkout (and stash, which uses checkout) was removing ignored
      items when you had only asked it to remove untracked ones.
      
      This commit moves the logic for advancing past an untracked dir
      while scanning for non-ignored items into an iterator helper fn,
      and uses that for both diff and checkout.
      Russell Belfer committed
  24. 22 Apr, 2014 2 commits
  25. 25 Mar, 2014 1 commit
    • Make submodules externally refcounted · a15c7802
      `git_submodule` objects were already refcounted internally in case
      the submodule name was different from the path at which it was
      stored.  This makes that refcounting externally used as well, so
      `git_submodule_lookup` and `git_submodule_add_setup` return an
      object that requires a `git_submodule_free` when done.
      Russell Belfer committed
  26. 04 Mar, 2014 1 commit
  27. 05 Feb, 2014 1 commit
  28. 15 Jan, 2014 1 commit
  29. 14 Nov, 2013 1 commit