summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 13:49:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-18 13:49:56 -0800
commit702bbfef3c96787c73976075c22b03a17da9ee1d (patch)
tree0525279118e12f1252ec9e219e463d9ccabf0cd6
parentMerge branch 'mm/multimail-1.5' (diff)
parentgit-p4: fix problem when p4 login is not necessary (diff)
downloadtgif-702bbfef3c96787c73976075c22b03a17da9ee1d.tar.xz
Merge branch 'po/git-p4-wo-login'
"git p4" update. * po/git-p4-wo-login: git-p4: fix problem when p4 login is not necessary
-rwxr-xr-xgit-p4.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-p4.py b/git-p4.py
index 1998c3e141..3e12774f96 100755
--- 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))