Merge branch 'po/git-p4-wo-login'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:55 +0000 (13:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2019 21:49:56 +0000 (13:49 -0800)
"git p4" update.

* po/git-p4-wo-login:
git-p4: fix problem when p4 login is not necessary

git-p4.py
index 1998c3e141bec5142032f08623b916d7741e64ac..3e12774f96bb185bb6860290ad187c986ec7fa76 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -332,6 +332,8 @@ def p4_check_access(min_expiration=1):
             die_bad_access("p4 error: {0}".format(data))
         else:
             die_bad_access("unknown error")
+    elif code == "info":
+        return
     else:
         die_bad_access("unknown error code {0}".format(code))