Merge branch 'ld/git-p4-expanded-keywords'

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c8b6c8abe47ec1c1b8a71ebc78db2d76aa43c444..053955349a92207b9f67aec73aa54143c2204129 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -38,7 +38,7 @@ def p4_build_cmd(cmd):
 
     host = gitConfig("git-p4.host")
     if len(host) > 0:
-        real_cmd += ["-h", host]
+        real_cmd += ["-H", host]
 
     client = gitConfig("git-p4.client")
     if len(client) > 0: