diff options
| author | Sven Strickroth <email@cs-ware.de> | 2014-04-16 16:59:43 +0200 |
|---|---|---|
| committer | Sven Strickroth <email@cs-ware.de> | 2014-04-16 18:51:16 +0200 |
| commit | fa13ee2d7cfadf0b1d425708657d93aeae728f46 (patch) | |
| tree | a9498dda0e6972c60f6e283b8158bd3ba77cecd3 /include | |
| parent | 37ab5ecc107118d5fa541cb42cc203649e549fd8 (diff) | |
| download | libgit2-fa13ee2d7cfadf0b1d425708657d93aeae728f46.tar.gz | |
Add GIT_BRANCH_ALL to git_branch_t enum
git_branch_t is an enum so requesting GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE is not possible as it is not a member of the enum (at least VS2013 C++ complains about it).
This fixes a regression introduced in commit a667ca8298193b3103c1dbdcb1f6c527e6e99eb2 (PR #1946).
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/branch.h | 2 | ||||
| -rw-r--r-- | include/git2/types.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/git2/branch.h b/include/git2/branch.h index ad2a70b1f..f28410000 100644 --- a/include/git2/branch.h +++ b/include/git2/branch.h @@ -84,7 +84,7 @@ typedef struct git_branch_iterator git_branch_iterator; * @param repo Repository where to find the branches. * @param list_flags Filtering flags for the branch * listing. Valid values are GIT_BRANCH_LOCAL, GIT_BRANCH_REMOTE - * or a combination of the two. + * or GIT_BRANCH_ALL. * * @return 0 on success or an error code */ diff --git a/include/git2/types.h b/include/git2/types.h index 2229f6bf4..9db59b16b 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -193,6 +193,7 @@ typedef enum { typedef enum { GIT_BRANCH_LOCAL = 1, GIT_BRANCH_REMOTE = 2, + GIT_BRANCH_ALL = GIT_BRANCH_LOCAL|GIT_BRANCH_REMOTE, } git_branch_t; /** Valid modes for index and tree entries. */ |