summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4
diff options
context:
space:
mode:
authorRussell Myers <mezner@russellmyers.com>2012-02-22 19:16:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-22 19:18:19 (GMT)
commit41799aa20904ff532ceb4f3ed95ba13e164dfc7a (patch)
tree0b404bca1d274f785b69f1e84acda60ccca4b5ef /contrib/fast-import/git-p4
parent2ab5ca80f05f6924d7ec1d4c294422a189a792f7 (diff)
downloadgit-41799aa20904ff532ceb4f3ed95ba13e164dfc7a.zip
git-41799aa20904ff532ceb4f3ed95ba13e164dfc7a.tar.gz
git-41799aa20904ff532ceb4f3ed95ba13e164dfc7a.tar.bz2
git-p4: the option to specify 'host' is -H, not -h
This was broken since the feature was introduced initially at abcaf07 (If the user has configured various parameters, use them., 2008-08-10). Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import/git-p4')
-rwxr-xr-xcontrib/fast-import/git-p42
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index a78d9c5..d2fd265 100755
--- 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: