summaryrefslogtreecommitdiff
path: root/lib/gitlab/git/blame.rb
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2017-01-05 13:46:26 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2017-01-05 13:46:26 +0100
commit22a34c81aa3801e5b453fd2c0a9364917e0aedbe (patch)
treec7d6cf6f1e799688e6b513ce4dbf36418eefe769 /lib/gitlab/git/blame.rb
parentefb8da895fb8d0976f98d0e54e36d9e61dccef89 (diff)
downloadgitlab-ce-22a34c81aa3801e5b453fd2c0a9364917e0aedbe.tar.gz
Use configured git rather than system gituse-configured-git
Diffstat (limited to 'lib/gitlab/git/blame.rb')
-rw-r--r--lib/gitlab/git/blame.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/blame.rb b/lib/gitlab/git/blame.rb
index 46f3969b6e1..2913230e979 100644
--- a/lib/gitlab/git/blame.rb
+++ b/lib/gitlab/git/blame.rb
@@ -27,7 +27,7 @@ module Gitlab
private
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
raw_output = IO.popen(cmd, 'rb') {|io| io.read }
output = encode_utf8(raw_output)