1. 11 May, 2023 1 commit
  2. 03 Mar, 2023 1 commit
    • xdiff: move xdiff to 'deps' · 462dbe21
      xdiff is a dependency (from git core) and more properly belongs in the
      'deps' directory. Move it there, and add a stub for cmake to resolve
      xdiff from the system location in the future. (At present, bundled xdiff
      remains hardcoded.)
      Edward Thomson committed
  3. 23 Feb, 2022 1 commit
  4. 17 Feb, 2022 1 commit
    • xdiff: use xdl_free not free · b722c45d
      We've added a lovely abstraction layer in xdiff so that it can call our
      allocation functions.  But it also needs to call our free functions.  We
      missed some `free` calls in `xmerge.c`.  Update them to use `xdl_free`.
      Without this, we will pass a pointer allocated with a custom allocator
      to the system free function.  :bomb:
      Edward Thomson committed
  5. 30 Jan, 2022 1 commit
    • xdiff: include new xdiff from git · 1458fb56
      Update to the xdiff used in git v2.35.0, with updates to our build
      configuration to ignore the sort of warnings that we normally care
      about (signed/unsigned mismatch, unused, etc.)
      
      Any git-specific abstraction bits are now redefined for our use in
      `git-xdiff.h`.  It is a (wildly optimistic) hope that we can use that
      indirection layer to standardize on a shared xdiff implementation.
      Edward Thomson committed
  6. 23 Aug, 2019 1 commit
  7. 22 Jan, 2019 1 commit
  8. 21 Jan, 2018 1 commit
  9. 01 Mar, 2016 1 commit
  10. 23 Feb, 2016 1 commit
  11. 05 Oct, 2015 1 commit
  12. 07 Jul, 2015 1 commit
    • xdiff: upgrade to core git 2.4.5 · 234ca40a
      Upgrade xdiff to version used in core git 2.4.5 (0df0541).
      
      Corrects an issue where an LF is added at EOF while applying
      an unrelated change (ba31180), cleans up some unused code (be89977 and
      e5b0662), and provides an improved callback to avoid leaking internal
      (to xdiff) structures (467d348).
      
      This also adds some additional functionality that we do not yet take
      advantage of, namely the ability to ignore changes whose lines are
      all blank (36617af).
      Edward Thomson committed
  13. 17 Apr, 2012 1 commit
  14. 02 Mar, 2012 1 commit