summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorLuke Diamand <luke@diamand.org>2020-01-29 11:12:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-30 20:20:58 (GMT)
commit19fa5ac333134fc3aa1e462780c4690177474ade (patch)
tree86d36764f511f2a58513b715ec7574efaecb3afd /git-p4.py
parent6026aff5bbe7389fa276188237b58afbef1b07ff (diff)
downloadgit-19fa5ac333134fc3aa1e462780c4690177474ade.zip
git-19fa5ac333134fc3aa1e462780c4690177474ade.tar.gz
git-19fa5ac333134fc3aa1e462780c4690177474ade.tar.bz2
git-p4: check for access to remote host earlier
Check we can talk to the remote host before starting the git-fastimport subchild. Otherwise we fail to connect, and then exit, leaving git-fastimport still running since we did not wait() for it. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-p4.py b/git-p4.py
index a69a24b..eb5bc28 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -3826,6 +3826,8 @@ class P4Sync(Command, P4UserMap):
b = b[len(self.projectName):]
self.createdBranches.add(b)
+ p4_check_access()
+
self.openStreams()
err = None