diff options
| author | Ben Straub <bstraub@github.com> | 2012-07-30 14:52:46 -0700 |
|---|---|---|
| committer | Ben Straub <bstraub@github.com> | 2012-07-30 15:48:06 -0700 |
| commit | 4bf5115642b64851f9a32a8157010b588bf44103 (patch) | |
| tree | 3b6096c0f39feacd11c40ceb1a38c68b7c2b844a /include/git2/index.h | |
| parent | 84595a30c01d5808ff71fda8ab63603214d665bf (diff) | |
| download | libgit2-4bf5115642b64851f9a32a8157010b588bf44103.tar.gz | |
Enable stats on git_index_read_tree.
Replace with the contents of
git_index_read_tree_with_stats() and improve
documentation comments.
Diffstat (limited to 'include/git2/index.h')
| -rw-r--r-- | include/git2/index.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/git2/index.h b/include/git2/index.h index 85f8cfc39..c88a1701c 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -336,18 +336,6 @@ GIT_EXTERN(const git_index_entry_unmerged *) git_index_get_unmerged_byindex(git_ GIT_EXTERN(int) git_index_entry_stage(const git_index_entry *entry); /** - * Read a tree into the index file - * - * The current index contents will be replaced by the specified tree. - * - * @param index an existing index object - * @param tree tree to read - * @return 0 or an error code - */ -GIT_EXTERN(int) git_index_read_tree(git_index *index, git_tree *tree); - - -/** * Read a tree into the index file with stats * * The current index contents will be replaced by the specified tree. The total @@ -355,10 +343,10 @@ GIT_EXTERN(int) git_index_read_tree(git_index *index, git_tree *tree); * * @param index an existing index object * @param tree tree to read - * @param stats structure that receives the total node count + * @param stats structure that receives the total node count (may be NULL) * @return 0 or an error code */ -GIT_EXTERN(int) git_index_read_tree_with_stats(git_index *index, git_tree *tree, git_indexer_stats *stats); +GIT_EXTERN(int) git_index_read_tree(git_index *index, git_tree *tree, git_indexer_stats *stats); /** @} */ GIT_END_DECL |