diff options
author | Russell Belfer <rb@github.com> | 2013-05-13 16:09:33 -0700 |
---|---|---|
committer | Russell Belfer <rb@github.com> | 2013-05-15 16:11:31 -0700 |
commit | 797dfb28fea6a3db542dc32d11a530570e147b73 (patch) | |
tree | 1f38f0efb66f1999f2eeff03a6937a90458af992 /include/git2/index.h | |
parent | 487884a9306e744eaebe659a7d0edb1c0c6c7ba7 (diff) | |
download | libgit2-797dfb28fea6a3db542dc32d11a530570e147b73.tar.gz |
Add APIs to dup and free git_index_entrys
This adds git_index_entry_dup to make a copy of an existing entry
and git_index_entry_free to release the memory of the copy. It
also updates the documentation for git_index_get_bypath and
git_index_get_byindex to make it clear that the returned structure
should *not* be modified.
Diffstat (limited to 'include/git2/index.h')
-rw-r--r-- | include/git2/index.h | 48 |
1 files changed, 36 insertions, 12 deletions
diff --git a/include/git2/index.h b/include/git2/index.h index 42cc4d640..cfb55ae5b 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -73,6 +73,8 @@ GIT_BEGIN_DECL #define GIT_IDXENTRY_UNPACKED (1 << 8) #define GIT_IDXENTRY_NEW_SKIP_WORKTREE (1 << 9) +#define GIT_IDXENTRY_ALLOCATED (1 << 10) +#define GIT_IDXENTRY_ALLOCATED_PATH (1 << 11) #define GIT_IDXENTRY_STAGE(E) (((E)->flags & GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT) @@ -284,11 +286,9 @@ GIT_EXTERN(void) git_index_clear(git_index *index); /** * Get a pointer to one of the entries in the index * - * The values of this entry can be modified (except the path) - * and the changes will be written back to disk on the next - * write() call. - * - * The entry should not be freed by the caller. + * The entry is not modifiable and should not be freed. If you need a + * permanent copy of the entry, use `git_index_entry_dup()` (after which + * you will be responsible for calling `git_index_entry_free()`) * * @param index an existing index object * @param n the position of the entry @@ -300,11 +300,9 @@ GIT_EXTERN(const git_index_entry *) git_index_get_byindex( /** * Get a pointer to one of the entries in the index * - * The values of this entry can be modified (except the path) - * and the changes will be written back to disk on the next - * write() call. - * - * The entry should not be freed by the caller. + * The entry is not modifiable and should not be freed. If you need a + * permanent copy of the entry, use `git_index_entry_dup()` (after which + * you will be responsible for calling `git_index_entry_free()`). * * @param index an existing index object * @param path path to search @@ -354,8 +352,7 @@ GIT_EXTERN(int) git_index_add(git_index *index, const git_index_entry *source_en /** * Return the stage number from a git index entry * - * This entry is calculated from the entry's flag - * attribute like this: + * This entry is calculated from the entry's flag attribute like this: * * (entry->flags & GIT_IDXENTRY_STAGEMASK) >> GIT_IDXENTRY_STAGESHIFT * @@ -364,6 +361,33 @@ GIT_EXTERN(int) git_index_add(git_index *index, const git_index_entry *source_en */ GIT_EXTERN(int) git_index_entry_stage(const git_index_entry *entry); +/** + * Make a copy of an entry that you can keep + * + * The `git_index_entry` pointers that are returned by the accessor + * functions are `const git_index_entry *` so they can't be modified + * and their lifetime as objects matches that of the `git_index`. + * + * This function allows you to make a copy of those entries that can + * be modified and which you are responsible for freeing. + * + * @param entry The entry to be copied + * @returns Newly allocated entry (or NULL if allocation failure) + */ +GIT_EXTERN(git_index_entry *) git_index_entry_dup(const git_index_entry *entry); + +/** + * Release the memory for a git_index_entry + * + * You should only call this on `git_index_entry` objects that you have + * obtained through `git_index_entry_dup()`. It is an error to call this + * on the values returned by `git_index_get_byindex()` or + * `git_index_get_bypath()`. + * + * @param entry The entry to be freed + */ +GIT_EXTERN(void) git_index_entry_free(git_index_entry *entry); + /**@}*/ /** @name Workdir Index Entry Functions |