proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-08 03:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #764 from sleeper/issue_763

Browse Source 
Fix issue #763
This commit is contained in:
Vicent Martí 2012-06-13 08:59:32 -07:00
commit 53774eb818
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/branch.c
View File

@ -149,9 +149,11 @@ static int branch_list_cb(const char *branch_name, void *payload)
{ {
branch_filter_data *filter = (branch_filter_data *)payload; branch_filter_data *filter = (branch_filter_data *)payload;
if ((filter->branch_type & GIT_BRANCH_LOCAL && git__prefixcmp(branch_name, GIT_REFS_HEADS_DIR) == 0) if (filter->branch_type & GIT_BRANCH_LOCAL && git__prefixcmp(branch_name, GIT_REFS_HEADS_DIR) == 0) {
|| (filter->branch_type & GIT_BRANCH_REMOTE && git__prefixcmp(branch_name, GIT_REFS_REMOTES_DIR) == 0)) return git_vector_insert(filter->branchlist, git__strdup(branch_name +strlen(GIT_REFS_HEADS_DIR)));
return git_vector_insert(filter->branchlist, git__strdup(branch_name)); } else if (filter->branch_type & GIT_BRANCH_REMOTE && git__prefixcmp(branch_name, GIT_REFS_REMOTES_DIR) == 0) {
return git_vector_insert(filter->branchlist, git__strdup(branch_name+strlen(GIT_REFS_DIR)));
}
return 0; return 0;
} }

4
tests-clar/refs/branches/listall.c
View File

@ -73,6 +73,6 @@ void test_refs_branches_listall__retrieve_remote_symbolic_HEAD_when_present(void
cl_git_pass(git_branch_list(&branch_list, repo, GIT_BRANCH_REMOTE)); cl_git_pass(git_branch_list(&branch_list, repo, GIT_BRANCH_REMOTE));
cl_assert_equal_i(3, branch_list.count); cl_assert_equal_i(3, branch_list.count);
assert_branch_list_contains(&branch_list, "refs/remotes/nulltoken/HEAD"); assert_branch_list_contains(&branch_list, "remotes/nulltoken/HEAD");
assert_branch_list_contains(&branch_list, "refs/remotes/nulltoken/master"); assert_branch_list_contains(&branch_list, "remotes/nulltoken/master");
} }