delta/libgit2.git/src/xdiff, branch cmn/tree-parser-sort-input

leaks: call `xdl_free_classifier`

2016-03-31T14:43:57+00:00

xdiff/xprepare: fix a memory leak

2016-03-31T09:34:03+00:00

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).

xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits

2016-03-31T09:33:40+00:00

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).

xdiff: fix memleak on error case

2016-03-01T07:56:23+00:00

Commit 3d1abc5afce fixes a memory leak in the xdiff code. In the
process of upstreaming the fix it was pointed out by Johannes
Schindelin that there is another memory leak present (see [1]).

Fix the second memory leak by applying the upstream fix to our
code base.

[1]: http://thread.gmane.org/gmane.comp.version-control.git/287034

xmerge: fix memory leak on error path

2016-02-23T11:07:37+00:00

xdiff: reference util.h in parent directory

2015-10-22T14:29:51+00:00

Although CMake will correctly configure include directories for us,
some people may use their own build system, and we should reference
`util.h` based on where it actually lives.

merge_file: treat large files as binary

2015-10-05T20:59:46+00:00

xdiff craps the bed on large files.  Treat very large files as binary,
so that it doesn't even have to try.

Refactor our merge binary handling to better match git.git, which
looks for a NUL in the first 8000 bytes.

xdiff: convert size variables to size_t

2015-10-05T20:59:41+00:00

xdiff: cleanup some warnings

2015-07-10T14:41:56+00:00

xdiff: upgrade to core git 2.4.5

2015-07-07T22:01:49+00:00

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).