1. 14 Jul, 2022 1 commit
  2. 20 Jun, 2022 1 commit
  3. 23 Feb, 2022 1 commit
  4. 17 Oct, 2021 1 commit
    • str: introduce `git_str` for internal, `git_buf` is external · f0e693b1
      libgit2 has two distinct requirements that were previously solved by
      `git_buf`.  We require:
      
      1. A general purpose string class that provides a number of utility APIs
         for manipulating data (eg, concatenating, truncating, etc).
      2. A structure that we can use to return strings to callers that they
         can take ownership of.
      
      By using a single class (`git_buf`) for both of these purposes, we have
      confused the API to the point that refactorings are difficult and
      reasoning about correctness is also difficult.
      
      Move the utility class `git_buf` to be called `git_str`: this represents
      its general purpose, as an internal string buffer class.  The name also
      is an homage to Junio Hamano ("gitstr").
      
      The public API remains `git_buf`, and has a much smaller footprint.  It
      is generally only used as an "out" param with strict requirements that
      follow the documentation.  (Exceptions exist for some legacy APIs to
      avoid breaking callers unnecessarily.)
      
      Utility functions exist to convert a user-specified `git_buf` to a
      `git_str` so that we can call internal functions, then converting it
      back again.
      Edward Thomson committed
  5. 20 Jul, 2019 1 commit
  6. 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
  7. 10 Jun, 2018 1 commit
  8. 28 May, 2015 1 commit
    • introduce `git_index_entry_is_conflict` · 9f545b9d
      It's not always obvious the mapping between stage level and
      conflict-ness.  More importantly, this can lead otherwise sane
      people to write constructs like `if (!git_index_entry_stage(entry))`,
      which (while technically correct) is unreadable.
      
      Provide a nice method to help avoid such messy thinking.
      Edward Thomson committed
  9. 01 Jul, 2014 1 commit
  10. 20 Mar, 2014 1 commit
  11. 25 Jan, 2014 1 commit
  12. 20 Jan, 2014 2 commits
    • Remove the "merge none" flag · 0e1ba46c
      The "merge none" (don't automerge) flag was only to aide in
      merge trivial tests.  We can easily determine whether merge
      trivial resulted in a trivial merge or an automerge by examining
      the REUC after automerge has completed.
      Edward Thomson committed
    • merge_file should use more aggressive levels · c1d648c5
      The default merge_file level was XDL_MERGE_MINIMAL, which will
      produce conflicts where there should not be in the case where
      both sides were changed identically.  Change the defaults to be
      more aggressive (XDL_MERGE_ZEALOUS) which will more aggressively
      compress non-conflicts.  This matches git.git's defaults.
      
      Increase testing around reverting a previously reverted commit to
      illustrate this problem.
      Edward Thomson committed
  13. 14 Nov, 2013 1 commit
  14. 15 May, 2013 1 commit
  15. 07 May, 2013 1 commit
  16. 30 Apr, 2013 2 commits