proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-08 04:30:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

diff_tform: don't compare empty hashsig_heaps

Browse Source 
Don't try to compare two empty hashsig_heaps.
This commit is contained in:
Edward Thomson 2015-03-03 18:19:42 -05:00
parent 76f034180a
commit a212716fc3
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hashsig.c
View File

@ -314,6 +314,9 @@ static int hashsig_heap_compare(const hashsig_heap *a, const hashsig_heap *b)
assert(a->cmp == b->cmp);
if (a->size + b->size == 0)
return 0;
/* hash heaps are sorted - just look for overlap vs total */
for (i = 0, j = 0; i < a->size && j < b->size; ) {

38
tests/diff/rename.c
View File

@ -1602,3 +1602,41 @@ void test_diff_rename__by_config_doesnt_mess_with_whitespace_settings(void)
git_tree_free(tree1);
git_tree_free(tree2);
}
/* test some variations on empty files */
void test_diff_rename__empty_files(void)
{
git_index *index;
git_diff *diff = NULL;
diff_expects exp;
git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT;
git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT;
diffopts.flags = GIT_DIFF_INCLUDE_UNTRACKED;
findopts.flags = GIT_DIFF_FIND_FOR_UNTRACKED |
GIT_DIFF_FIND_AND_BREAK_REWRITES |
GIT_DIFF_FIND_RENAMES_FROM_REWRITES;
cl_git_pass(git_repository_index(&index, g_repo));
cl_git_rewritefile("renames/ikeepsix.txt", "");
cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt"));
cl_git_rmfile("renames/ikeepsix.txt");
cl_git_rewritefile("renames/ikeepsix2.txt", "\n\n\n");
cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &diffopts));
cl_git_pass(git_diff_find_similar(diff, &findopts));
memset(&exp, 0, sizeof(exp));
cl_git_pass(git_diff_foreach(
diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp));
cl_assert_equal_i(2, exp.files);
cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]);
cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]);
git_diff_free(diff);
git_index_free(index);
}