diff options
| author | Russell Belfer <rb@github.com> | 2013-05-17 17:21:45 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-05-17 17:21:45 -0700 |
| commit | d958e37a48c693a1907bede563bd835935d23499 (patch) | |
| tree | d6ded717a6cb71bc6384918acd772817fef17baa /tests-clar/diff/rename.c | |
| parent | 0293450e217c1cb6966655bb00cc11fdf626083d (diff) | |
| download | libgit2-d958e37a48c693a1907bede563bd835935d23499.tar.gz | |
Fix issues with git_diff_find_similar
There are a number of bugs in the rename code that only were
obvious when I started testing it against large old repos with
more complex patterns. (The code to do that testing is not ready
to merge with libgit2, but I do plan to add more thorough tests.)
This contains a significant number of changes and also tweaks the
public API slightly to make emulating core git easier.
Most notably, this separates the GIT_DIFF_FIND_AND_BREAK_REWRITES
flag into FIND_REWRITES (which adds a self-similarity score to
every modified file) and BREAK_REWRITES (which splits the modified
deltas into add/remove pairs in the diff list). When you do a raw
output of core git, rewrites show up as M090 or such, not at A and
D output, so I wanted to be able to emulate that.
Publicly, this also changes the flags to be uint16_t since we
don't need values out of that range.
Internally, this contains significant changes from a number of
small bug fixes (like using the wrong side of the diff to decide
if the object could be found in the ODB vs the workdir) to larger
issues about which files can and should be compared and how the
various edge cases of similarity scores should be treated.
Honestly, I don't think this is the last update that will have to
be made to this code, but I think this moves us closer to correct
behavior and I tried to document the code so it would be easier
to follow..
Diffstat (limited to 'tests-clar/diff/rename.c')
| -rw-r--r-- | tests-clar/diff/rename.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests-clar/diff/rename.c b/tests-clar/diff/rename.c index 1349d4013..01f65abfd 100644 --- a/tests-clar/diff/rename.c +++ b/tests-clar/diff/rename.c @@ -377,7 +377,8 @@ void test_diff_rename__handles_small_files(void) */ cl_git_pass(git_diff_tree_to_index(&diff, g_repo, tree, index, &diffopts)); - opts.flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES | GIT_DIFF_FIND_AND_BREAK_REWRITES; + opts.flags = GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES | + GIT_DIFF_FIND_AND_BREAK_REWRITES; cl_git_pass(git_diff_find_similar(diff, &opts)); git_diff_list_free(diff); |