[third] Disable git_p4's usage of git configuration
Since we're using the module outside of a git repository context we don't have a git config to reference. Instead, we'll just use the environment variables we're passed. (imported from commit 8ae707d5d60eb700052e0ee89e7d36c660e00bb6)
This commit is contained in:
parent
4e7eb8b377
commit
bd72921f7e
|
@ -52,27 +52,6 @@ def p4_build_cmd(cmd):
|
||||||
"""
|
"""
|
||||||
real_cmd = ["p4"]
|
real_cmd = ["p4"]
|
||||||
|
|
||||||
user = gitConfig("git-p4.user")
|
|
||||||
if len(user) > 0:
|
|
||||||
real_cmd += ["-u",user]
|
|
||||||
|
|
||||||
password = gitConfig("git-p4.password")
|
|
||||||
if len(password) > 0:
|
|
||||||
real_cmd += ["-P", password]
|
|
||||||
|
|
||||||
port = gitConfig("git-p4.port")
|
|
||||||
if len(port) > 0:
|
|
||||||
real_cmd += ["-p", port]
|
|
||||||
|
|
||||||
host = gitConfig("git-p4.host")
|
|
||||||
if len(host) > 0:
|
|
||||||
real_cmd += ["-H", host]
|
|
||||||
|
|
||||||
client = gitConfig("git-p4.client")
|
|
||||||
if len(client) > 0:
|
|
||||||
real_cmd += ["-c", client]
|
|
||||||
|
|
||||||
|
|
||||||
if isinstance(cmd,basestring):
|
if isinstance(cmd,basestring):
|
||||||
real_cmd = ' '.join(real_cmd) + ' ' + cmd
|
real_cmd = ' '.join(real_cmd) + ' ' + cmd
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue