Commit 07e71bfa08a87ae8ab9e58abf8c760bb100e885f
2018-11-04T13:14:20
apply: test multiple deltas to new 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 60 61 62
diff --git a/tests/apply/apply_helpers.h b/tests/apply/apply_helpers.h
index 964f167..563a51d 100644
--- a/tests/apply/apply_helpers.h
+++ b/tests/apply/apply_helpers.h
@@ -277,6 +277,23 @@
"-and serve it up.\n" \
"+and serve it up!\n"
+#define DIFF_TWO_DELTAS_ONE_NEW_FILE \
+ "diff --git a/newfile.txt b/newfile.txt\n" \
+ "new file mode 100644\n" \
+ "index 0000000..6434b13\n" \
+ "--- /dev/null\n" \
+ "+++ b/newfile.txt\n" \
+ "@@ -0,0 +1 @@\n" \
+ "+This is a new file.\n" \
+ "diff --git a/newfile.txt b/newfile.txt\n" \
+ "index 6434b13..08d4c44 100644\n" \
+ "--- a/newfile.txt\n" \
+ "+++ b/newfile.txt\n" \
+ "@@ -1 +1,3 @@\n" \
+ " This is a new file.\n" \
+ "+\n" \
+ "+This is another change to a new file.\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 faafc9a..aa1700e 100644
--- a/tests/apply/both.c
+++ b/tests/apply/both.c
@@ -599,3 +599,29 @@ void test_apply_both__two_deltas_one_file(void)
git_diff_free(diff);
}
+
+void test_apply_both__two_deltas_one_new_file(void)
+{
+ git_diff *diff;
+
+ struct merge_index_entry both_expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "08d4c445cf0078f3d9b604b82f32f4d87e083325", 0, "newfile.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_TWO_DELTAS_ONE_NEW_FILE,
+ strlen(DIFF_TWO_DELTAS_ONE_NEW_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);
+}