Merge branch 'use-configured-git' into 'master'
Use configured git rather thans system git See merge request !8460
This commit is contained in:
commit
3eebca7b5c
|
@ -31,7 +31,7 @@ class CycleAnalytics
|
||||||
repository = @project.repository.raw_repository
|
repository = @project.repository.raw_repository
|
||||||
sha = @project.repository.commit(ref).sha
|
sha = @project.repository.commit(ref).sha
|
||||||
|
|
||||||
cmd = %W(git --git-dir=#{repository.path} log)
|
cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{repository.path} log)
|
||||||
cmd << '--format=%H'
|
cmd << '--format=%H'
|
||||||
cmd << "--after=#{@from.iso8601}"
|
cmd << "--after=#{@from.iso8601}"
|
||||||
cmd << sha
|
cmd << sha
|
||||||
|
|
|
@ -27,7 +27,7 @@ module Gitlab
|
||||||
private
|
private
|
||||||
|
|
||||||
def load_blame
|
def load_blame
|
||||||
cmd = %W(git --git-dir=#{@repo.path} blame -p #{@sha} -- #{@path})
|
cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{@repo.path} blame -p #{@sha} -- #{@path})
|
||||||
# Read in binary mode to ensure ASCII-8BIT
|
# Read in binary mode to ensure ASCII-8BIT
|
||||||
raw_output = IO.popen(cmd, 'rb') {|io| io.read }
|
raw_output = IO.popen(cmd, 'rb') {|io| io.read }
|
||||||
output = encode_utf8(raw_output)
|
output = encode_utf8(raw_output)
|
||||||
|
|
|
@ -332,7 +332,7 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def log_by_shell(sha, options)
|
def log_by_shell(sha, options)
|
||||||
cmd = %W(git --git-dir=#{path} log)
|
cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path} log)
|
||||||
cmd += %W(-n #{options[:limit].to_i})
|
cmd += %W(-n #{options[:limit].to_i})
|
||||||
cmd += %w(--format=%H)
|
cmd += %w(--format=%H)
|
||||||
cmd += %W(--skip=#{options[:offset].to_i})
|
cmd += %W(--skip=#{options[:offset].to_i})
|
||||||
|
@ -913,7 +913,7 @@ module Gitlab
|
||||||
return []
|
return []
|
||||||
end
|
end
|
||||||
|
|
||||||
cmd = %W(git --git-dir=#{path} ls-tree)
|
cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path} ls-tree)
|
||||||
cmd += %w(-r)
|
cmd += %w(-r)
|
||||||
cmd += %w(--full-tree)
|
cmd += %w(--full-tree)
|
||||||
cmd += %w(--full-name)
|
cmd += %w(--full-name)
|
||||||
|
@ -1108,7 +1108,7 @@ module Gitlab
|
||||||
end
|
end
|
||||||
|
|
||||||
def archive_to_file(treeish = 'master', filename = 'archive.tar.gz', format = nil, compress_cmd = %w(gzip -n))
|
def archive_to_file(treeish = 'master', filename = 'archive.tar.gz', format = nil, compress_cmd = %w(gzip -n))
|
||||||
git_archive_cmd = %W(git --git-dir=#{path} archive)
|
git_archive_cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path} archive)
|
||||||
|
|
||||||
# Put files into a directory before archiving
|
# Put files into a directory before archiving
|
||||||
prefix = "#{archive_name(treeish)}/"
|
prefix = "#{archive_name(treeish)}/"
|
||||||
|
|
|
@ -3,7 +3,7 @@ namespace :gitlab do
|
||||||
|
|
||||||
desc "GitLab | Git | Repack"
|
desc "GitLab | Git | Repack"
|
||||||
task repack: :environment do
|
task repack: :environment do
|
||||||
failures = perform_git_cmd(%W(git repack -a --quiet), "Repacking repo")
|
failures = perform_git_cmd(%W(#{Gitlab.config.git.bin_path} repack -a --quiet), "Repacking repo")
|
||||||
if failures.empty?
|
if failures.empty?
|
||||||
puts "Done".color(:green)
|
puts "Done".color(:green)
|
||||||
else
|
else
|
||||||
|
@ -13,17 +13,17 @@ namespace :gitlab do
|
||||||
|
|
||||||
desc "GitLab | Git | Run garbage collection on all repos"
|
desc "GitLab | Git | Run garbage collection on all repos"
|
||||||
task gc: :environment do
|
task gc: :environment do
|
||||||
failures = perform_git_cmd(%W(git gc --auto --quiet), "Garbage Collecting")
|
failures = perform_git_cmd(%W(#{Gitlab.config.git.bin_path} gc --auto --quiet), "Garbage Collecting")
|
||||||
if failures.empty?
|
if failures.empty?
|
||||||
puts "Done".color(:green)
|
puts "Done".color(:green)
|
||||||
else
|
else
|
||||||
output_failures(failures)
|
output_failures(failures)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
desc "GitLab | Git | Prune all repos"
|
desc "GitLab | Git | Prune all repos"
|
||||||
task prune: :environment do
|
task prune: :environment do
|
||||||
failures = perform_git_cmd(%W(git prune), "Git Prune")
|
failures = perform_git_cmd(%W(#{Gitlab.config.git.bin_path} prune), "Git Prune")
|
||||||
if failures.empty?
|
if failures.empty?
|
||||||
puts "Done".color(:green)
|
puts "Done".color(:green)
|
||||||
else
|
else
|
||||||
|
|
|
@ -25,32 +25,32 @@ module SeedHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_bare_seeds
|
def create_bare_seeds
|
||||||
system(git_env, *%W(git clone --bare #{GITLAB_URL}),
|
system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{GITLAB_URL}),
|
||||||
chdir: SEED_REPOSITORY_PATH,
|
chdir: SEED_REPOSITORY_PATH,
|
||||||
out: '/dev/null',
|
out: '/dev/null',
|
||||||
err: '/dev/null')
|
err: '/dev/null')
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_normal_seeds
|
def create_normal_seeds
|
||||||
system(git_env, *%W(git clone #{TEST_REPO_PATH} #{TEST_NORMAL_REPO_PATH}),
|
system(git_env, *%W(#{Gitlab.config.git.bin_path} clone #{TEST_REPO_PATH} #{TEST_NORMAL_REPO_PATH}),
|
||||||
out: '/dev/null',
|
out: '/dev/null',
|
||||||
err: '/dev/null')
|
err: '/dev/null')
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_mutable_seeds
|
def create_mutable_seeds
|
||||||
system(git_env, *%W(git clone #{TEST_REPO_PATH} #{TEST_MUTABLE_REPO_PATH}),
|
system(git_env, *%W(#{Gitlab.config.git.bin_path} clone #{TEST_REPO_PATH} #{TEST_MUTABLE_REPO_PATH}),
|
||||||
out: '/dev/null',
|
out: '/dev/null',
|
||||||
err: '/dev/null')
|
err: '/dev/null')
|
||||||
|
|
||||||
system(git_env, *%w(git branch -t feature origin/feature),
|
system(git_env, *%w(git branch -t feature origin/feature),
|
||||||
chdir: TEST_MUTABLE_REPO_PATH, out: '/dev/null', err: '/dev/null')
|
chdir: TEST_MUTABLE_REPO_PATH, out: '/dev/null', err: '/dev/null')
|
||||||
|
|
||||||
system(git_env, *%W(git remote add expendable #{GITLAB_URL}),
|
system(git_env, *%W(#{Gitlab.config.git.bin_path} remote add expendable #{GITLAB_URL}),
|
||||||
chdir: TEST_MUTABLE_REPO_PATH, out: '/dev/null', err: '/dev/null')
|
chdir: TEST_MUTABLE_REPO_PATH, out: '/dev/null', err: '/dev/null')
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_broken_seeds
|
def create_broken_seeds
|
||||||
system(git_env, *%W(git clone --bare #{TEST_REPO_PATH} #{TEST_BROKEN_REPO_PATH}),
|
system(git_env, *%W(#{Gitlab.config.git.bin_path} clone --bare #{TEST_REPO_PATH} #{TEST_BROKEN_REPO_PATH}),
|
||||||
out: '/dev/null',
|
out: '/dev/null',
|
||||||
err: '/dev/null')
|
err: '/dev/null')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue