diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-03-19 11:43:45 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-19 16:55:59 +0300 |
| commit | 60d4d220231a767c6049d9f60a8a4b54f34325e2 (patch) | |
| tree | e98fe1adb64e4b0dcae9528643ec1eda1a0f99f0 /spec | |
| parent | 2eaeda28ddebeb01f13dcda394c5eaeff7662f9f (diff) | |
Merge branch 'sh-bump-rugged-0.28.0' into 'master'
Bump Rugged to 0.28.0
See merge request gitlab-org/gitlab-ce!25660
(cherry picked from commit afeb2dd98e4a32a4f5355a59c6db1e599707e9c2)
30caec32 Bump Rugged to 0.28.0
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/git/repository_spec.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index 7e6dfa30e37..8ba6862392c 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -1688,6 +1688,11 @@ describe Gitlab::Git::Repository, :seed_helper do expect(repository.delete_config(*%w[does.not.exist test.foo1 test.foo2])).to be_nil + # Workaround for https://github.com/libgit2/rugged/issues/785: If + # Gitaly changes .gitconfig while Rugged has the file loaded + # Rugged::Repository#each_key will report stale values unless a + # lookup is done first. + expect(repository_rugged.config['test.foo1']).to be_nil config_keys = repository_rugged.config.each_key.to_a expect(config_keys).not_to include('test.foo1') expect(config_keys).not_to include('test.foo2') |