diff options
| author | Edward Thomson <ethomson@github.com> | 2016-03-17 15:19:45 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-03-23 17:17:02 -0400 |
| commit | 0a2e10328aedae4e989c61f46c29f1fd26ae92d6 (patch) | |
| tree | fa220a11f8bdb8dd6d7ac19f4e35bb585b1b79fb /src/checkout.c | |
| parent | 6cd9573f54f0054618f23da585e0d8661b882e34 (diff) | |
| download | libgit2-0a2e10328aedae4e989c61f46c29f1fd26ae92d6.tar.gz | |
iterator: drop `advance_into_or_over`
Now that iterators do not return `GIT_ENOTFOUND` when advancing
into an empty directory, we do not need a special `advance_into_or_over`
function.
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c index 0fbb7fc16..fed1819aa 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -657,7 +657,7 @@ static int checkout_action( if (cmp == 0) { if (wd->mode == GIT_FILEMODE_TREE) { /* case 2 - entry prefixed by workdir tree */ - error = git_iterator_advance_into_or_over(wditem, workdir); + error = git_iterator_advance_into(wditem, workdir); if (error < 0 && error != GIT_ITEROVER) goto done; continue; |