зеркало из https://github.com/microsoft/git.git
Catch p4 errors in rollback early enough (before deleting refs!)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Родитель
ac3e0d79ee
Коммит
66a2f52395
|
@ -152,6 +152,9 @@ class P4RollBack(Command):
|
|||
return False
|
||||
maxChange = int(args[0])
|
||||
|
||||
if "p4ExitCode" in p4Cmd("p4 changes -m 1"):
|
||||
die("Problems executing p4");
|
||||
|
||||
if self.rollbackLocalBranches:
|
||||
refPrefix = "refs/heads/"
|
||||
lines = mypopen("git rev-parse --symbolic --branches").readlines()
|
||||
|
|
Загрузка…
Ссылка в новой задаче