Commit a212716fc3ab684c67e1a1c8c45dc3e88f87b0a1
2015-03-03T18:19:42
diff_tform: don't compare empty hashsig_heaps Don't try to compare two empty hashsig_heaps.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
diff --git a/src/hashsig.c b/src/hashsig.c
index 0ddfed9..cbe56e7 100644
--- a/src/hashsig.c
+++ b/src/hashsig.c
@@ -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; ) {
diff --git a/tests/diff/rename.c b/tests/diff/rename.c
index fe31a41..6592446 100644
--- a/tests/diff/rename.c
+++ b/tests/diff/rename.c
@@ -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);
+}