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
30a46ab1
Commit
30a46ab1
authored
Oct 18, 2012
by
Ben Straub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust for rebase
parent
aa1e8674
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
3 deletions
+1
-3
src/checkout.c
+0
-2
tests-clar/checkout/typechange.c
+1
-1
No files found.
src/checkout.c
View file @
30a46ab1
...
...
@@ -190,7 +190,6 @@ static int checkout_remove_the_old(
git_checkout_opts
*
opts
=
data
->
checkout_opts
;
GIT_UNUSED
(
progress
);
data
->
stats
->
processed
++
;
if
((
delta
->
status
==
GIT_DELTA_UNTRACKED
&&
(
opts
->
checkout_strategy
&
GIT_CHECKOUT_REMOVE_UNTRACKED
)
!=
0
)
||
...
...
@@ -221,7 +220,6 @@ static int checkout_create_the_new(
bool
do_checkout
=
false
,
do_notify
=
false
;
GIT_UNUSED
(
progress
);
data
->
stats
->
processed
++
;
if
(
delta
->
status
==
GIT_DELTA_MODIFIED
||
delta
->
status
==
GIT_DELTA_TYPECHANGE
)
...
...
tests-clar/checkout/typechange.c
View file @
30a46ab1
...
...
@@ -49,7 +49,7 @@ void test_checkout_typechange__checkout_typechanges(void)
cl_git_pass
(
git_revparse_single
(
&
obj
,
g_repo
,
g_typechange_oids
[
i
]));
/* fprintf(stderr, "checking out '%s'\n", g_typechange_oids[i]); */
cl_git_pass
(
git_checkout_tree
(
g_repo
,
obj
,
&
opts
,
NULL
));
cl_git_pass
(
git_checkout_tree
(
g_repo
,
obj
,
&
opts
));
git_object_free
(
obj
);
...
...
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