Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
9d81defa
Commit
9d81defa
authored
Jun 28, 2018
by
Edward Thomson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
apply tests: GIT_APPLY_LOCATION_INDEX with parsed patches
parent
eef34e4e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
0 deletions
+28
-0
tests/apply/index.c
+28
-0
No files found.
tests/apply/index.c
View file @
9d81defa
...
@@ -65,3 +65,31 @@ void test_apply_index__generate_diff(void)
...
@@ -65,3 +65,31 @@ void test_apply_index__generate_diff(void)
git_commit_free
(
a_commit
);
git_commit_free
(
a_commit
);
git_commit_free
(
b_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
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment