Skip to content

Commit dceedbb

Browse files
author
Max Kostyukevich
committed
apply: Test for git_apply_to_tree failures when new files are added
Introduce an unit test to validate if git_apply_to_tree() fails when an applied patch adds new files.
1 parent de4bc2b commit dceedbb

File tree

1 file changed

+36
-0
lines changed

1 file changed

+36
-0
lines changed

tests/apply/tree.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "clar_libgit2.h"
2+
#include "apply_helpers.h"
23
#include "../merge/merge_helpers.h"
34

45
static git_repository *repo;
@@ -56,3 +57,38 @@ void test_apply_tree__one(void)
5657
git_commit_free(b_commit);
5758
}
5859

60+
void test_apply_tree__adds_file(void)
61+
{
62+
git_oid a_oid;
63+
git_commit *a_commit;
64+
git_tree *a_tree;
65+
git_diff *diff;
66+
git_index *index = NULL;
67+
68+
struct merge_index_entry expected[] = {
69+
{ 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
70+
{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
71+
{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
72+
{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
73+
{ 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
74+
{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
75+
{ 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
76+
};
77+
78+
git_oid_fromstr(&a_oid, "539bd011c4822c560c1d17cab095006b7a10f707");
79+
80+
cl_git_pass(git_commit_lookup(&a_commit, repo, &a_oid));
81+
82+
cl_git_pass(git_commit_tree(&a_tree, a_commit));
83+
84+
cl_git_pass(git_diff_from_buffer(&diff,
85+
DIFF_ADD_FILE, strlen(DIFF_ADD_FILE)));
86+
87+
cl_git_pass(git_apply_to_tree(&index, repo, a_tree, diff, NULL));
88+
merge_test_index(index, expected, 7);
89+
90+
git_diff_free(diff);
91+
git_tree_free(a_tree);
92+
git_commit_free(a_commit);
93+
}
94+

0 commit comments

Comments
 (0)