diff options
| author | Russell Belfer <rb@github.com> | 2012-10-05 15:56:57 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-10-09 11:59:34 -0700 |
| commit | 0d64bef941928046d114c4da1acb70bd2907855e (patch) | |
| tree | 4ae0ac6484c62b0a63ca44f937d67ba15f97d7f0 /src/iterator.h | |
| parent | f3a04e0f49d0f46e578613d1c27161abc4c2bf22 (diff) | |
| download | libgit2-0d64bef941928046d114c4da1acb70bd2907855e.tar.gz | |
Add complex checkout test and then fix checkout
This started as a complex new test for checkout going through the
"typechanges" test repository, but that revealed numerous issues
with checkout, including:
* complete failure with submodules
* failure to create blobs with exec bits
* problems when replacing a tree with a blob because the tree
"example/" sorts after the blob "example" so the delete was
being processed after the single file blob was created
This fixes most of those problems and includes a number of other
minor changes that made it easier to do that, including improving
the TYPECHANGE support in diff/status, etc.
Diffstat (limited to 'src/iterator.h')
| -rw-r--r-- | src/iterator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/iterator.h b/src/iterator.h index 29c8985d4..d7df50137 100644 --- a/src/iterator.h +++ b/src/iterator.h @@ -142,6 +142,9 @@ GIT_INLINE(git_iterator_type_t) git_iterator_type(git_iterator *iter) extern int git_iterator_current_tree_entry( git_iterator *iter, const git_tree_entry **tree_entry); +extern int git_iterator_current_parent_tree( + git_iterator *iter, const char *parent_path, const git_tree **tree_ptr); + extern int git_iterator_current_is_ignored(git_iterator *iter); /** |