Commit 9c34c9961e3897261c1ceafbdace55fcf56d7abe
2018-06-25T17:03:14
apply: handle file additions Don't attempt to read the postimage file during a file addition, simply use an empty buffer as the postimage. Also, test that we can handle file additions.
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 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89
diff --git a/src/apply.c b/src/apply.c
index cc8e5f7..20d7557 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -407,9 +407,13 @@ static int apply_one(
if (delta->status == GIT_DELTA_DELETED)
goto done;
- if ((error = git_reader_read(&pre_contents,
- preimage_reader, delta->old_file.path)) < 0 ||
- (error = git_apply__patch(&post_contents, &filename, &mode,
+ if (delta->status != GIT_DELTA_ADDED) {
+ if ((error = git_reader_read(&pre_contents,
+ preimage_reader, delta->old_file.path)) < 0)
+ goto done;
+ }
+
+ if ((error = git_apply__patch(&post_contents, &filename, &mode,
pre_contents.ptr, pre_contents.size, patch)) < 0 ||
(error = git_blob_create_frombuffer(&blob_id, repo,
post_contents.ptr, post_contents.size)) < 0)
diff --git a/tests/apply/workdir.c b/tests/apply/workdir.c
index 525946b..3c55203 100644
--- a/tests/apply/workdir.c
+++ b/tests/apply/workdir.c
@@ -29,10 +29,14 @@ static int iterator_compare(const git_index_entry **entries, void *_data)
git_oid expected_id;
struct iterator_compare_data *data = (struct iterator_compare_data *)_data;
- cl_assert_equal_i(GIT_IDXENTRY_STAGE(head_entry), GIT_IDXENTRY_STAGE(index_entry));
- cl_assert_equal_oid(&head_entry->id, &index_entry->id);
- cl_assert_equal_i(head_entry->mode, index_entry->mode);
- cl_assert_equal_s(head_entry->path, index_entry->path);
+ if (!head_entry || !index_entry) {
+ cl_assert_equal_p(head_entry, index_entry);
+ } else {
+ cl_assert_equal_i(GIT_IDXENTRY_STAGE(head_entry), GIT_IDXENTRY_STAGE(index_entry));
+ cl_assert_equal_oid(&head_entry->id, &index_entry->id);
+ cl_assert_equal_i(head_entry->mode, index_entry->mode);
+ cl_assert_equal_s(head_entry->path, index_entry->path);
+ }
if (!workdir_entry)
return 0;
@@ -220,3 +224,44 @@ void test_apply_workdir__removes_file(void)
git_diff_free(diff);
git_commit_free(commit);
}
+
+void test_apply_workdir__adds_file(void)
+{
+ git_oid oid;
+ git_commit *commit;
+ git_diff *diff;
+
+ const char *diff_file =
+ "diff --git a/newfile.txt b/newfile.txt\n"
+ "new file mode 100644\n"
+ "index 0000000..6370543\n"
+ "--- /dev/null\n"
+ "+++ b/newfile.txt\n"
+ "@@ -0,0 +1,2 @@\n"
+ "+This is a new file!\n"
+ "+Added by a patch.\n";
+
+ struct merge_index_entry expected[] = {
+ { 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
+ { 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
+ { 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
+ { 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
+ { 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
+ { 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
+ { 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
+ };
+ size_t expected_cnt = sizeof(expected) / sizeof(struct merge_index_entry);
+
+ git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
+ cl_git_pass(git_commit_lookup(&commit, repo, &oid));
+
+ cl_git_pass(git_diff_from_buffer(&diff, diff_file, strlen(diff_file)));
+
+ cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
+ cl_git_pass(git_apply(repo, diff, NULL));
+
+ validate_apply_workdir(repo, expected, expected_cnt);
+
+ git_diff_free(diff);
+ git_commit_free(commit);
+}