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
692c0408
Commit
692c0408
authored
Nov 09, 2014
by
Pierre-Olivier Latour
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a couple Clang warnings
parent
4865cc3f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
src/checkout.c
+4
-0
tests/status/worktree_init.c
+0
-1
No files found.
src/checkout.c
View file @
692c0408
...
...
@@ -1145,12 +1145,16 @@ static int checkout_conflict_append_remove(
checkout_data
*
data
=
payload
;
const
char
*
name
;
assert
(
ancestor
||
ours
||
theirs
);
if
(
ancestor
)
name
=
git__strdup
(
ancestor
->
path
);
else
if
(
ours
)
name
=
git__strdup
(
ours
->
path
);
else
if
(
theirs
)
name
=
git__strdup
(
theirs
->
path
);
else
abort
();
GITERR_CHECK_ALLOC
(
name
);
...
...
tests/status/worktree_init.c
View file @
692c0408
...
...
@@ -127,7 +127,6 @@ void test_status_worktree_init__bracket_in_filename(void)
git_index
*
index
;
status_entry_single
result
;
unsigned
int
status_flags
;
int
error
;
#define FILE_WITH_BRACKET "LICENSE[1].md"
#define FILE_WITHOUT_BRACKET "LICENSE1.md"
...
...
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