delta/libgit2.git/src/diff_tform.c, branch cmn/error-buffer

stash: save the workdir file when deleted in index

2015-06-23T23:15:16+00:00

When stashing the workdir tree, examine the index as well.  Using
a mechanism similar to `git_diff_tree_to_workdir_with_index`
allows us to determine that a file was added in the index and
subsequently modified in the working directory.  Without examining
the index, we would erroneously believe that this file was
untracked and fail to include it in the working directory tree.

Use a slightly modified `git_diff_tree_to_workdir_with_index` in
order to avoid some of the behavior custom to `git diff`.  In
particular, be sure to include the working directory side of a
file when it was deleted in the index.

git_diff__merge: allow pluggable diff merges

2015-06-23T20:48:50+00:00

diff_tform: remove reversed copy of delta merger

2015-06-23T20:48:46+00:00

Drop `git_diff__merge_like_cgit_reversed`, since it's a copy and
paste mess of slightly incompatible changes.

Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()

2015-06-23T04:37:41+00:00

This fixes a bug where if a file was in conflicted state in either diff,
it would not always remain in conflicted state in the merged diff.

Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()

2015-06-10T17:09:10+00:00

git_diff_find_similar() now ignores git_diff_delta records with a status
of GIT_DELTA_CONFLICTED, which fixes a crash due to assert() being hit.

Make sure to also update delta->nfiles when merging diffs

2015-03-30T21:06:21+00:00

When diffs are generated, the value for the 'nfiles' field of 'git_diff_delta'
will be consistent with the value in the 'status' field. Merging diffs can
modify the 'status' field of some deltas and the 'nfiles' field needs to be
updated accordingly.

Plug a few leaks

2015-03-03T23:29:37+00:00

Make our overflow check look more like gcc/clang's

2015-02-13T14:27:33+00:00

Make our overflow checking look more like gcc and clang's, so that
we can substitute it out with the compiler instrinsics on platforms
that support it.  This means dropping the ability to pass `NULL` as
an out parameter.

As a result, the macros also get updated to reflect this as well.

allocations: test for overflow of requested size

2015-02-13T03:54:46+00:00

Introduce some helper macros to test integer overflow from arithmetic
and set error message appropriately.

Added GIT_HASHSIG_ALLOW_SMALL_FILES to allow computing signatures for small files

2015-01-14T16:17:56+00:00

The implementation of the hashsig API disallows computing a signature on
small files containing only a few lines. This new flag disables this
behavior.

git_diff_find_similar() sets this flag by default which means that rename
/ copy detection of small files will now work. This in turn affects the
behavior of the git_status and git_blame APIs which will now detect rename
of small files assuming the right options are passed.