Catch p4 errors in rollback early enough (before deleting refs!)

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
git-mirror · May 23, 2007 · 66a2f52 · 66a2f52
1 parent ac3e0d7
commit 66a2f52
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
@@ -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()