diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-20 12:08:09 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-20 13:20:47 +0300 |
| commit | 078764e4638b5b3d3c500c05d923e19a4a82b58c (patch) | |
| tree | e172183b5bec0728c374e831b8692cb9b420a951 /lib | |
| parent | 17fe8174a27e8fb5f5f4bbfce0be454bea943bf3 (diff) | |
Merge branch '40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use' into 'master'
Fix Gitlab::Git::Repository#remote_tags using unexisting variable
Closes #40300
See merge request gitlab-org/gitlab-ce!15466
(cherry picked from commit c563661f910934f1103690d46f9af8a75423077d)
63beaa32 Fix Gitlab::Git::Repository#remote_tags using unexisting variable
d622a8c5 Merge branch 'master' into 40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository_mirroring.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git/repository_mirroring.rb b/lib/gitlab/git/repository_mirroring.rb index 637e7a0659c..4500482d68f 100644 --- a/lib/gitlab/git/repository_mirroring.rb +++ b/lib/gitlab/git/repository_mirroring.rb @@ -78,7 +78,7 @@ module Gitlab def list_remote_tags(remote) tag_list, exit_code, error = nil - cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{full_path} ls-remote --tags #{remote}) + cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path} ls-remote --tags #{remote}) Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thr| tag_list = stdout.read @@ -88,7 +88,7 @@ module Gitlab raise RemoteError, error unless exit_code.zero? - tag_list.split('\n') + tag_list.split("\n") end end end |