9 files changed, 54 insertions, 1 deletions

diff --git a/tests/blame/simple.c b/tests/blame/simple.c
index 30b78168f..7330e71f7 100644
--- a/tests/blame/simple.c
+++ b/tests/blame/simple.c
@@ -334,3 +334,52 @@ void test_blame_simple__can_restrict_to_first_parent_commits(void)
 	check_blame_hunk_index(g_repo, g_blame, 2,  6, 5, 0, "63d671eb", "b.txt");
 	check_blame_hunk_index(g_repo, g_blame, 3, 11, 5, 0, "bc7c5ac2", "b.txt");
 }
+
+void test_blame_simple__can_follow_renames(void)
+{
+	git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
+
+	cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git")));
+
+	cl_git_pass(git_blame_file(&g_blame, g_repo, "c_exact.txt", &opts));
+	cl_assert_equal_i(1, git_blame_get_hunk_count(g_blame));
+	check_blame_hunk_index(g_repo, g_blame, 0,  1, 10, 0, "49aed320", "c.txt");
+
+	cl_git_pass(git_blame_file(&g_blame, g_repo, "d_similar.txt", &opts));
+	cl_assert_equal_i(3, git_blame_get_hunk_count(g_blame));
+	check_blame_hunk_index(g_repo, g_blame, 0,  1, 5, 0, "49aed320", "d.txt");
+	check_blame_hunk_index(g_repo, g_blame, 1,  6, 4, 0, "c66b79ec", "d_similar.txt");
+	check_blame_hunk_index(g_repo, g_blame, 2,  10, 1, 0, "49aed320", "d.txt");
+}
+
+void test_blame_simple__can_follow_only_exact_renames(void)
+{
+	git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
+	opts.find_options.flags = GIT_DIFF_FIND_EXACT_MATCH_ONLY;
+
+	cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git")));
+
+	cl_git_pass(git_blame_file(&g_blame, g_repo, "c_exact.txt", &opts));
+	cl_assert_equal_i(1, git_blame_get_hunk_count(g_blame));
+	check_blame_hunk_index(g_repo, g_blame, 0,  1, 10, 0, "49aed320", "c.txt");
+
+	cl_git_pass(git_blame_file(&g_blame, g_repo, "d_similar.txt", &opts));
+	cl_assert_equal_i(1, git_blame_get_hunk_count(g_blame));
+	check_blame_hunk_index(g_repo, g_blame, 0,  1, 10, 0, "c66b79ec", "d_similar.txt");
+}
+
+void test_blame_simple__does_not_follow_renames(void)
+{
+	git_blame_options opts = GIT_BLAME_OPTIONS_INIT;
+	opts.find_options.flags = GIT_DIFF_FIND_NO_RENAMES;
+
+	cl_git_pass(git_repository_open(&g_repo, cl_fixture("blametest.git")));
+
+	cl_git_pass(git_blame_file(&g_blame, g_repo, "c_exact.txt", &opts));
+	cl_assert_equal_i(1, git_blame_get_hunk_count(g_blame));
+	check_blame_hunk_index(g_repo, g_blame, 0,  1, 10, 0, "c347c926", "c_exact.txt");
+
+	cl_git_pass(git_blame_file(&g_blame, g_repo, "d_similar.txt", &opts));
+	cl_assert_equal_i(1, git_blame_get_hunk_count(g_blame));
+	check_blame_hunk_index(g_repo, g_blame, 0,  1, 10, 0, "c66b79ec", "d_similar.txt");
+}
diff --git a/tests/resources/blametest.git/objects/49/aed320fb734fe132f8a0723743b78ab369b17c b/tests/resources/blametest.git/objects/49/aed320fb734fe132f8a0723743b78ab369b17c
new file mode 100644
index 000000000..58419f9b1
--- /dev/null
+++ b/tests/resources/blametest.git/objects/49/aed320fb734fe132f8a0723743b78ab369b17c
diff --git a/tests/resources/blametest.git/objects/68/6d51de188b5a542c9af7f64a4ac5f31b4c43aa b/tests/resources/blametest.git/objects/68/6d51de188b5a542c9af7f64a4ac5f31b4c43aa
new file mode 100644
index 000000000..7d8605deb
--- /dev/null
+++ b/tests/resources/blametest.git/objects/68/6d51de188b5a542c9af7f64a4ac5f31b4c43aa
diff --git a/tests/resources/blametest.git/objects/6c/90a25d65273c4599f00fa396082b7cc9e5b749 b/tests/resources/blametest.git/objects/6c/90a25d65273c4599f00fa396082b7cc9e5b749
new file mode 100644
index 000000000..cbe75ee25
--- /dev/null
+++ b/tests/resources/blametest.git/objects/6c/90a25d65273c4599f00fa396082b7cc9e5b749
diff --git a/tests/resources/blametest.git/objects/7e/18c1f0e766379f588fcee7ec7c2e45295d8df7 b/tests/resources/blametest.git/objects/7e/18c1f0e766379f588fcee7ec7c2e45295d8df7
new file mode 100644
index 000000000..89533f6dc
--- /dev/null
+++ b/tests/resources/blametest.git/objects/7e/18c1f0e766379f588fcee7ec7c2e45295d8df7
diff --git a/tests/resources/blametest.git/objects/c3/47c9265f655dcd26dd0d41a244d4c1bb6cb8c6 b/tests/resources/blametest.git/objects/c3/47c9265f655dcd26dd0d41a244d4c1bb6cb8c6
new file mode 100644
index 000000000..1db685d13
--- /dev/null
+++ b/tests/resources/blametest.git/objects/c3/47c9265f655dcd26dd0d41a244d4c1bb6cb8c6
@@ -0,0 +1,2 @@
+x
5��j1�S�)�s0{Z�t&\��2�%���NF'�<~��T;;3>��T��j	
F�h��G-
y��#b��#N��9hg��-a��؆�$FgH�0���E#�(rf��Fv��¶�����V�]�ڲ�
����p��wk����`PD�
+5�#v%���P�}���gxi�|�����cZ|�[���K�޾���ɻ��O�M�
\ No newline at end of file
diff --git a/tests/resources/blametest.git/objects/c6/6b79ec0ee8f5aa0e981168c4c96e5e2483d361 b/tests/resources/blametest.git/objects/c6/6b79ec0ee8f5aa0e981168c4c96e5e2483d361
new file mode 100644
index 000000000..9df2f1bd9
--- /dev/null
+++ b/tests/resources/blametest.git/objects/c6/6b79ec0ee8f5aa0e981168c4c96e5e2483d361
@@ -0,0 +1,2 @@
+x
5��j1E��Wh�E!�!{f �@v-]�{Y��C�q�إ�_����s��9���F�PK��F�
+Q���dQ�D�0;$$��Q
��Q�k68𤝝����v!Ȁ�4b@V�;�#;A�~�o빕Hk�W*K���~���/��u�9=�Bc�D9�(�&:��X�}������K���~^�1-\���'�8�I*��@u�8�V�=��7]RO

\ No newline at end of file
diff --git a/tests/resources/blametest.git/objects/f7/fe99763e059cb1989222c230c8a0102d0efc56 b/tests/resources/blametest.git/objects/f7/fe99763e059cb1989222c230c8a0102d0efc56
new file mode 100644
index 000000000..12f6624a2
--- /dev/null
+++ b/tests/resources/blametest.git/objects/f7/fe99763e059cb1989222c230c8a0102d0efc56
diff --git a/tests/resources/blametest.git/refs/heads/master b/tests/resources/blametest.git/refs/heads/master
index d1bc4ca6b..454f53717 100644
--- a/tests/resources/blametest.git/refs/heads/master
+++ b/tests/resources/blametest.git/refs/heads/master
@@ -1 +1 @@
-6653ff42313eb5c82806f145391b18a9699800c7
+c66b79ec0ee8f5aa0e981168c4c96e5e2483d361