Commit b73a42f6aabe3f00ac01d9843c053c2393573d2b
2018-11-04T10:48:23
apply: test a patch with rename and modification Create a test applying a patch with a rename and a modification of a file.
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
diff --git a/tests/apply/apply_helpers.h b/tests/apply/apply_helpers.h
index 8f94d39..1b40cd3 100644
--- a/tests/apply/apply_helpers.h
+++ b/tests/apply/apply_helpers.h
@@ -112,6 +112,21 @@
"+but the shin OR knuckle is the nicest.\n" \
"+Another new line.\n" \
+#define DIFF_RENAME_AND_MODIFY_FILE \
+ "diff --git a/beef.txt b/notbeef.txt\n" \
+ "similarity index 97%\n" \
+ "rename from beef.txt\n" \
+ "rename to notbeef.txt\n" \
+ "index 68f6182..6fa1014 100644\n" \
+ "--- a/beef.txt\n" \
+ "+++ b/notbeef.txt\n" \
+ "@@ -1,4 +1,4 @@\n" \
+ "-BEEF SOUP.\n" \
+ "+THIS IS NOT BEEF SOUP, IT HAS A NEW NAME.\n" \
+ "\n" \
+ " Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
+ " which must be taken away entirely, or the soup will be greasy. Wash the\n"
+
struct iterator_compare_data {
struct merge_index_entry *expected;
size_t cnt;
diff --git a/tests/apply/both.c b/tests/apply/both.c
index e937166..e8d13c7 100644
--- a/tests/apply/both.c
+++ b/tests/apply/both.c
@@ -382,3 +382,28 @@ void test_apply_both__honors_crlf_attributes(void)
git_diff_free(diff);
}
+
+void test_apply_both__rename_and_modify(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "6fa10147f00fe1fab1d5e835529a9dad53db8552", 0, "notbeef.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t both_expected_cnt = sizeof(both_expected) /
+ sizeof(struct merge_index_entry);
+
+ cl_git_pass(git_diff_from_buffer(&diff, DIFF_RENAME_AND_MODIFY_FILE,
+ strlen(DIFF_RENAME_AND_MODIFY_FILE)));
+ cl_git_pass(git_apply(repo, diff, GIT_APPLY_LOCATION_BOTH, NULL));
+
+ validate_apply_index(repo, both_expected, both_expected_cnt);
+ validate_apply_workdir(repo, both_expected, both_expected_cnt);
+
+ git_diff_free(diff);
+}