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
f16f2927
Commit
f16f2927
authored
5 years ago
by
Edward Thomson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge_file: use GIT_ASSERT
parent
61f33f3e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
src/merge_file.c
+11
-3
No files found.
src/merge_file.c
View file @
f16f2927
...
...
@@ -36,7 +36,10 @@ static int merge_file_input_from_index(
{
int
error
=
0
;
assert
(
input_out
&&
odb_object_out
&&
odb
&&
entry
);
GIT_ASSERT_ARG
(
input_out
);
GIT_ASSERT_ARG
(
odb_object_out
);
GIT_ASSERT_ARG
(
odb
);
GIT_ASSERT_ARG
(
entry
);
if
((
error
=
git_odb_read
(
odb_object_out
,
odb
,
&
entry
->
id
))
<
0
)
goto
done
;
...
...
@@ -241,7 +244,9 @@ int git_merge_file(
{
git_merge_file_input
inputs
[
3
]
=
{
{
0
}
};
assert
(
out
&&
ours
&&
theirs
);
GIT_ASSERT_ARG
(
out
);
GIT_ASSERT_ARG
(
ours
);
GIT_ASSERT_ARG
(
theirs
);
memset
(
out
,
0x0
,
sizeof
(
git_merge_file_result
));
...
...
@@ -268,7 +273,10 @@ int git_merge_file_from_index(
git_odb_object
*
odb_object
[
3
]
=
{
0
};
int
error
=
0
;
assert
(
out
&&
repo
&&
ours
&&
theirs
);
GIT_ASSERT_ARG
(
out
);
GIT_ASSERT_ARG
(
repo
);
GIT_ASSERT_ARG
(
ours
);
GIT_ASSERT_ARG
(
theirs
);
memset
(
out
,
0x0
,
sizeof
(
git_merge_file_result
));
...
...
This diff is collapsed.
Click to expand it.
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