From fa45d25f387d3727932b6439e84905e7fe64a85f Mon Sep 17 00:00:00 2001 From: Frederick Ros Date: Wed, 13 Jun 2012 14:03:48 +0200 Subject: [PATCH] Fix issue #763 --- src/branch.c | 8 +++++--- tests-clar/refs/branches/listall.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/branch.c b/src/branch.c index 5d5a24038..8b97a8206 100644 --- a/src/branch.c +++ b/src/branch.c @@ -149,9 +149,11 @@ static int branch_list_cb(const char *branch_name, void *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) - || (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)); + if (filter->branch_type & GIT_BRANCH_LOCAL && git__prefixcmp(branch_name, GIT_REFS_HEADS_DIR) == 0) { + return git_vector_insert(filter->branchlist, git__strdup(branch_name +strlen(GIT_REFS_HEADS_DIR))); + } 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; } diff --git a/tests-clar/refs/branches/listall.c b/tests-clar/refs/branches/listall.c index 49e192489..77f8270fb 100644 --- a/tests-clar/refs/branches/listall.c +++ b/tests-clar/refs/branches/listall.c @@ -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_assert_equal_i(3, branch_list.count); - assert_branch_list_contains(&branch_list, "refs/remotes/nulltoken/HEAD"); - assert_branch_list_contains(&branch_list, "refs/remotes/nulltoken/master"); + assert_branch_list_contains(&branch_list, "remotes/nulltoken/HEAD"); + assert_branch_list_contains(&branch_list, "remotes/nulltoken/master"); }