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
db22a91b
Commit
db22a91b
authored
Apr 21, 2016
by
Edward Thomson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
iterator: ignore submodule in has_ended
parent
1dc44910
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
4 deletions
+3
-4
src/iterator.c
+3
-4
No files found.
src/iterator.c
View file @
db22a91b
...
@@ -206,8 +206,7 @@ GIT_INLINE(bool) iterator_has_started(
...
@@ -206,8 +206,7 @@ GIT_INLINE(bool) iterator_has_started(
return
false
;
return
false
;
}
}
GIT_INLINE
(
bool
)
iterator_has_ended
(
GIT_INLINE
(
bool
)
iterator_has_ended
(
git_iterator
*
iter
,
const
char
*
path
)
git_iterator
*
iter
,
const
char
*
path
,
bool
is_submodule
)
{
{
if
(
iter
->
end
==
NULL
)
if
(
iter
->
end
==
NULL
)
return
false
;
return
false
;
...
@@ -797,7 +796,7 @@ static int tree_iterator_advance(const git_index_entry **out, git_iterator *i)
...
@@ -797,7 +796,7 @@ static int tree_iterator_advance(const git_index_entry **out, git_iterator *i)
continue
;
continue
;
/* if this path is after our end, stop */
/* if this path is after our end, stop */
if
(
iterator_has_ended
(
&
iter
->
base
,
iter
->
entry_path
.
ptr
,
false
))
{
if
(
iterator_has_ended
(
&
iter
->
base
,
iter
->
entry_path
.
ptr
))
{
error
=
GIT_ITEROVER
;
error
=
GIT_ITEROVER
;
break
;
break
;
}
}
...
@@ -2034,7 +2033,7 @@ static int index_iterator_advance(
...
@@ -2034,7 +2033,7 @@ static int index_iterator_advance(
continue
;
continue
;
}
}
if
(
iterator_has_ended
(
&
iter
->
base
,
entry
->
path
,
is_submodule
))
{
if
(
iterator_has_ended
(
&
iter
->
base
,
entry
->
path
))
{
error
=
GIT_ITEROVER
;
error
=
GIT_ITEROVER
;
break
;
break
;
}
}
...
...
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