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
73427b94
Unverified
Commit
73427b94
authored
Jun 27, 2019
by
Patrick Steinhardt
Committed by
GitHub
Jun 27, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5142 from scottfurry/StaticChkFixExamples
Resolve static check warnings in example code
parents
e9102def
2ba7dbbe
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletions
+2
-1
examples/init.c
+1
-1
examples/merge.c
+1
-0
No files found.
examples/init.c
View file @
73427b94
...
@@ -244,5 +244,5 @@ static void parse_opts(struct opts *o, int argc, char *argv[])
...
@@ -244,5 +244,5 @@ static void parse_opts(struct opts *o, int argc, char *argv[])
}
}
if
(
!
o
->
dir
)
if
(
!
o
->
dir
)
usage
(
"must specify directory to init"
,
NULL
);
usage
(
"must specify directory to init"
,
""
);
}
}
examples/merge.c
View file @
73427b94
...
@@ -220,6 +220,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, merge_opt
...
@@ -220,6 +220,7 @@ static int create_merge_commit(git_repository *repo, git_index *index, merge_opt
check_lg2
(
git_repository_head
(
&
head_ref
,
repo
),
"failed to get repo HEAD"
,
NULL
);
check_lg2
(
git_repository_head
(
&
head_ref
,
repo
),
"failed to get repo HEAD"
,
NULL
);
if
(
resolve_refish
(
&
merge_commit
,
repo
,
opts
->
heads
[
0
]))
{
if
(
resolve_refish
(
&
merge_commit
,
repo
,
opts
->
heads
[
0
]))
{
fprintf
(
stderr
,
"failed to resolve refish %s"
,
opts
->
heads
[
0
]);
fprintf
(
stderr
,
"failed to resolve refish %s"
,
opts
->
heads
[
0
]);
free
(
parents
);
return
-
1
;
return
-
1
;
}
}
...
...
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