Commit 6e611f7c3c8dc5ffd9ac7ea249d2913cd4f0971c
2015-06-22T14:17:39
index: add a diff test for smudging a file which becomes empty Even though the file is empty and thus the size in the entry matches, we should be able to detect it as a difference.
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
diff --git a/tests/index/racy.c b/tests/index/racy.c
index 089fe5d..3a4bc43 100644
--- a/tests/index/racy.c
+++ b/tests/index/racy.c
@@ -98,3 +98,46 @@ void test_index_racy__write_index_just_after_file(void)
git_diff_free(diff);
git_index_free(index);
}
+
+void test_index_racy__empty_file_after_smudge(void)
+{
+ git_index *index;
+ git_diff *diff;
+ git_buf path = GIT_BUF_INIT;
+ int i, found_race = 0;
+ const git_index_entry *entry;
+
+ /* Make sure we do have a timestamp */
+ cl_git_pass(git_repository_index(&index, g_repo));
+ cl_git_pass(git_index_write(index));
+
+ cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "A"));
+
+ /* Make sure writing the file, adding and rewriting happen in the same second */
+ for (i = 0; i < 10; i++) {
+ struct stat st;
+ cl_git_mkfile(path.ptr, "A");
+
+ cl_git_pass(git_index_add_bypath(index, "A"));
+ cl_git_mkfile(path.ptr, "B");
+ cl_git_pass(git_index_write(index));
+
+ cl_git_mkfile(path.ptr, "");
+
+ cl_git_pass(p_stat(path.ptr, &st));
+ cl_assert(entry = git_index_get_bypath(index, "A", 0));
+ if (entry->mtime.seconds == (int32_t) st.st_mtime) {
+ found_race = 1;
+ break;
+ }
+
+ }
+
+ if (!found_race)
+ cl_fail("failed to find race after 10 attempts");
+
+ cl_assert_equal_i(0, entry->file_size);
+
+ cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL));
+ cl_assert_equal_i(1, git_diff_num_deltas(diff));
+}