Commit 93ad8344 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'sh-fix-branch-count' into 'master'

Fix inconsistent number of branches when remote branches are present

Closes #36934

See merge request !13784
......@@ -153,7 +153,7 @@ def branch_count
if is_enabled
gitaly_ref_client.count_branch_names
else
rugged.branches.count do |ref|
rugged.branches.each(:local).count do |ref|
begin
ref.name && ref.target # ensures the branch is valid
......
......@@ -977,6 +977,36 @@ def commit_files(commit)
it 'returns the number of branches' do
expect(repository.branch_count).to eq(10)
end
context 'with local and remote branches' do
let(:repository) do
Gitlab::Git::Repository.new('default', File.join(TEST_MUTABLE_REPO_PATH, '.git'))
end
before do
create_remote_branch(repository, 'joe', 'remote_branch', 'master')
repository.create_branch('local_branch', 'master')
end
after do
FileUtils.rm_rf(TEST_MUTABLE_REPO_PATH)
ensure_seeds
end
it 'returns the count of local branches' do
expect(repository.branch_count).to eq(repository.local_branches.count)
end
context 'with Gitaly disabled' do
before do
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
end
it 'returns the count of local branches' do
expect(repository.branch_count).to eq(repository.local_branches.count)
end
end
end
end
describe "#ls_files" do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment