mirror of
https://github.com/git/git.git
synced 2024-05-22 03:56:33 +02:00
git-p4: fix problem when p4 login is not necessary
In a perforce setup where login is not required, communication fails because p4_check_access does not understand the response from the p4 client. Fixed by detecting and ignoring the "info" response. Signed-off-by: Peter Osterlund <peterosterlund2@gmail.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0d0ac3826a
commit
d4990d56a8
|
@ -332,6 +332,8 @@ def p4_check_access(min_expiration=1):
|
||||||
die_bad_access("p4 error: {0}".format(data))
|
die_bad_access("p4 error: {0}".format(data))
|
||||||
else:
|
else:
|
||||||
die_bad_access("unknown error")
|
die_bad_access("unknown error")
|
||||||
|
elif code == "info":
|
||||||
|
return
|
||||||
else:
|
else:
|
||||||
die_bad_access("unknown error code {0}".format(code))
|
die_bad_access("unknown error code {0}".format(code))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue