summaryrefslogtreecommitdiff
path: root/include/git2
diff options
context:
space:
mode:
authorRussell Belfer <rb@github.com>2013-01-29 13:54:08 -0800
committerRussell Belfer <rb@github.com>2013-01-29 13:54:08 -0800
commit4657fc1cab3943ae82e3c0a4d93c4b1ef222ce11 (patch)
tree97aa15b9e8fbdd0f347babd2e9f534918228176c /include/git2
parent764b9e71469f9edc0839c2cf4207ed7ab4a222ce (diff)
parent590365db54e7f0311bd77d09270c7c3714a33b3c (diff)
downloadlibgit2-4657fc1cab3943ae82e3c0a4d93c4b1ef222ce11.tar.gz
Merge pull request #1285 from phkelley/vector
Vector improvements and their fallout
Diffstat (limited to 'include/git2')
-rw-r--r--include/git2/index.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/git2/index.h b/include/git2/index.h
index ad6d19733..9f9d144cf 100644
--- a/include/git2/index.h
+++ b/include/git2/index.h
@@ -403,11 +403,12 @@ GIT_EXTERN(int) git_index_remove_bypath(git_index *index, const char *path);
* Find the first index of any entries which point to given
* path in the Git index.
*
+ * @param at_pos the address to which the position of the index entry is written (optional)
* @param index an existing index object
* @param path path to search
- * @return an index >= 0 if found, -1 otherwise
+ * @return 0 if found, < 0 otherwise (GIT_ENOTFOUND)
*/
-GIT_EXTERN(int) git_index_find(git_index *index, const char *path);
+GIT_EXTERN(int) git_index_find(size_t *at_pos, git_index *index, const char *path);
/**@}*/
@@ -495,11 +496,12 @@ GIT_EXTERN(unsigned int) git_index_reuc_entrycount(git_index *index);
* Finds the resolve undo entry that points to the given path in the Git
* index.
*
+ * @param at_pos the address to which the position of the reuc entry is written (optional)
* @param index an existing index object
* @param path path to search
- * @return an index >= 0 if found, -1 otherwise
+ * @return 0 if found, < 0 otherwise (GIT_ENOTFOUND)
*/
-GIT_EXTERN(int) git_index_reuc_find(git_index *index, const char *path);
+GIT_EXTERN(int) git_index_reuc_find(size_t *at_pos, git_index *index, const char *path);
/**
* Get a resolve undo entry from the index.