diff options
| author | Carlos Martín Nieto <cmn@elego.de> | 2011-03-31 15:29:13 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@elego.de> | 2011-03-31 15:29:13 +0200 |
| commit | f026f2b9ee5f0aeced5c366c890c4a29eee2a1c7 (patch) | |
| tree | c26b59992df7ebe645cb9485a4eb70c41e127816 /include/git2/common.h | |
| parent | 11d0e70578baf47fb1cb565e0336e18d417e5da6 (diff) | |
| parent | a796d24cf697b0b51aa0ca7ef887e980f0d9fb7a (diff) | |
| download | libgit2-f026f2b9ee5f0aeced5c366c890c4a29eee2a1c7.tar.gz | |
Merge upstream/development
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Diffstat (limited to 'include/git2/common.h')
| -rw-r--r-- | include/git2/common.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/include/git2/common.h b/include/git2/common.h index ec338db4e..7cb98b824 100644 --- a/include/git2/common.h +++ b/include/git2/common.h @@ -27,6 +27,7 @@ #include "thread-utils.h" #include <time.h> +#include <stdlib.h> #ifdef __cplusplus # define GIT_BEGIN_DECL extern "C" { @@ -118,13 +119,13 @@ /** The object or config variable type is invalid or doesn't match */ #define GIT_EINVALIDTYPE (GIT_ERROR - 8) -/** The object cannot be written that because it's missing internal data */ +/** The object cannot be written because it's missing internal data */ #define GIT_EMISSINGOBJDATA (GIT_ERROR - 9) /** The packfile for the ODB is corrupted */ #define GIT_EPACKCORRUPTED (GIT_ERROR - 10) -/** Failed to adquire or release a file lock */ +/** Failed to acquire or release a file lock */ #define GIT_EFLOCKFAIL (GIT_ERROR - 11) /** The Z library failed to inflate/deflate an object's data */ @@ -145,7 +146,7 @@ /** The specified symbolic reference is too deeply nested */ #define GIT_ETOONESTEDSYMREF (GIT_ERROR - 17) -/** The pack-refs file is either corrupted of its format is not currently supported */ +/** The pack-refs file is either corrupted or its format is not currently supported */ #define GIT_EPACKEDREFSCORRUPTED (GIT_ERROR - 18) /** The path is invalid */ @@ -157,7 +158,21 @@ /** The state of the reference is not valid */ #define GIT_EINVALIDREFSTATE (GIT_ERROR - 21) +/** This feature has not been implemented yet */ +#define GIT_ENOTIMPLEMENTED (GIT_ERROR - 22) + +/** A reference with this name already exists */ +#define GIT_EEXISTS (GIT_ERROR - 23) + GIT_BEGIN_DECL + +typedef struct { + char **strings; + size_t count; +} git_strarray; + +GIT_EXTERN(void) git_strarray_free(git_strarray *array); + /** @} */ GIT_END_DECL #endif |