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. 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
  5. 21 Jan, 2018 1 commit
  6. 31 Mar, 2016 3 commits
    • xdiff/xprepare: fix a memory leak · 6045afd3
      The xdl_prepare_env() function may initialise an xdlclassifier_t
      data structure via xdl_init_classifier(), which allocates memory
      to several fields, for example 'rchash', 'rcrecs' and 'ncha'.
      If this function later exits due to the failure of xdl_optimize_ctxs(),
      then this xdlclassifier_t structure, and the memory allocated to it,
      is not cleaned up.
      
      In order to fix the memory leak, insert a call to xdl_free_classifier()
      before returning.
      
      This patch was originally written by Ramsay Jones (see commit
      87f16258367a3b9a62663b11f898a4a6f3c19d31 in git.git).
      Patrick Steinhardt committed
    • xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits · 1bce1487
      Commit 307ab20b3 ("xdiff: PATIENCE/HISTOGRAM are not independent option
      bits", 19-02-2012) introduced the XDF_DIFF_ALG() macro to access the
      flag bits used to represent the diff algorithm requested. In addition,
      code which had used explicit manipulation of the flag bits was changed
      to use the macros.
      
      However, one example of direct manipulation remains. Update this code to
      use the XDF_DIFF_ALG() macro.
      
      This patch was originally written by Ramsay Jones (see commit
      5cd6978a9cfef58de061a9525f3678ade479564d in git.git).
      Patrick Steinhardt committed
  7. 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
  8. 02 Mar, 2012 1 commit