Commit 9d81defa79d5eccb863c712a0c4b97952d45c886

Edward Thomson 2018-06-28T16:26:08

apply tests: GIT_APPLY_LOCATION_INDEX with parsed patches

diff --git a/tests/apply/index.c b/tests/apply/index.c
index 2d1368c..ac35442 100644
--- a/tests/apply/index.c
+++ b/tests/apply/index.c
@@ -65,3 +65,31 @@ void test_apply_index__generate_diff(void)
 	git_commit_free(a_commit);
 	git_commit_free(b_commit);
 }
+
+void test_apply_index__parsed_diff(void)
+{
+	git_diff *diff;
+	git_apply_options opts = GIT_APPLY_OPTIONS_INIT;
+
+	struct merge_index_entry index_expected[] = {
+		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
+		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
+	};
+	size_t index_expected_cnt = sizeof(index_expected) /
+		sizeof(struct merge_index_entry);
+
+	cl_git_pass(git_diff_from_buffer(&diff,
+		DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
+
+	opts.location = GIT_APPLY_LOCATION_INDEX;
+	cl_git_pass(git_apply(repo, diff, &opts));
+
+	validate_apply_index(repo, index_expected, index_expected_cnt);
+	validate_workdir_unchanged(repo);
+
+	git_diff_free(diff);
+}