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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/refs/branches/iterator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/refs/branches/iterator.c b/tests/refs/branches/iterator.c index 29ca59aca..76b35a7d6 100644 --- a/tests/refs/branches/iterator.c +++ b/tests/refs/branches/iterator.c @@ -48,7 +48,7 @@ static void assert_retrieval(unsigned int flags, unsigned int expected_count) void test_refs_branches_iterator__retrieve_all_branches(void) { - assert_retrieval(GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE, 14); + assert_retrieval(GIT_BRANCH_ALL, 14); } void test_refs_branches_iterator__retrieve_remote_branches(void) @@ -139,7 +139,7 @@ void test_refs_branches_iterator__mix_of_packed_and_loose(void) r2 = cl_git_sandbox_init("testrepo2"); - cl_git_pass(git_branch_iterator_new(&iter, r2, GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE)); + cl_git_pass(git_branch_iterator_new(&iter, r2, GIT_BRANCH_ALL)); contains_branches(exp, iter); git_branch_iterator_free(iter); |