diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-04-13 13:16:08 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-04-13 13:16:08 +0000 |
commit | 9ab4408bfa82602c54673a6fc1691d201a29c7cf (patch) | |
tree | bead472da97149eaf096b116ecf68b2e7d59b31e | |
parent | 0b422c476d433d1a4ca2077205d50136fcbe43ef (diff) | |
parent | 0c357db3a4c326f92638eeeeba7846fa491f785e (diff) | |
download | gitlab-ce-9ab4408bfa82602c54673a6fc1691d201a29c7cf.tar.gz |
Merge branch 'remove-pipe' into 'master'
Remove bogus '|' symbol
See merge request gitlab-org/gitlab-ce!18313
-rw-r--r-- | lib/gitlab/git/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 986b3228b3e..11a421cb430 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1470,7 +1470,7 @@ module Gitlab return [] if empty? || safe_query.blank? - args = %W(ls-tree --full-tree -r #{ref || root_ref} --name-status | #{safe_query}) + args = %W(ls-tree -r --name-status --full-tree #{ref || root_ref} -- #{safe_query}) run_git(args).first.lines.map(&:strip) end |