From: Ben Keene <seraphire@xxxxxxxxx>
Depending on the version of GIT and Python installed, the perforce program (p4) may not resolve on Windows without the program extension.
Check the operating system (platform.system) and if it is reporting that it is Windows, use the full filename of "p4.exe" instead of "p4"
The original code unconditionally used "p4" as the binary filename.
This change is Python2 and Python3 compatible.
Thanks to: Junio C Hamano <gitster@xxxxxxxxx> and Denton Liu <liu.denton@xxxxxxxxx> for patiently explaining proper format for my submissions.
Signed-off-by: Ben Keene <seraphire@xxxxxxxxx>
(cherry picked from commit 9a3a5c4e6d29dbef670072a9605c7a82b3729434)
---
git-p4.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 60c73b6a37..b2ffbc057b 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -75,7 +75,11 @@ def p4_build_cmd(cmd):
location. It means that hooking into the environment, or other configuration
can be done more easily.
"""
- real_cmd = ["p4"]
+ # Look for the P4 binary
+ if (platform.system() == "Windows"):
+ real_cmd = ["p4.exe"]
+ else:
+ real_cmd = ["p4"]
user = gitConfig("git-p4.user")
if len(user) > 0:
--
gitgitgadget
