Skip to content

Commit c428f60

Browse files
author
root
committed
Merge #348 by hand
1 parent c4cdd26 commit c428f60

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Diff for: lib/redmine/scm/adapters/xitolite_adapter.rb

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ module Scm
1010
module Adapters
1111
class XitoliteAdapter < AbstractAdapter
1212

13+
# Git executable name
14+
XITOLITE_BIN = Redmine::Configuration['scm_git_command'] || "git"
15+
1316
class GitBranch < Branch
1417
attr_accessor :is_default
1518
end
1619

1720
class << self
1821

19-
# Change from the original method
2022
def client_command
21-
@@bin ||= 'git (with sudo)'
23+
@@bin ||= XITOLITE_BIN
2224
end
2325

2426

Diff for: lib/redmine_git_hosting/commands.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def sudo_shell_params
140140
# Return the Git command with prepend args (mainly env vars like FOO=BAR git push).
141141
#
142142
def git(args = [])
143-
[*args, 'git']
143+
[*args, Repository::Xitolite.scm_command]
144144
end
145145

146146

0 commit comments

Comments
 (0)