From: Simon Hausmann <shausman@trolltech.com>
Date: Wed, 23 May 2007 21:40:48 +0000 (+0200)
Subject: Catch p4 errors in rollback early enough (before deleting refs!)
X-Git-Tag: v1.5.3-rc0~65^2^2~66
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66a2f523958129e9b697d30ed44a5174010cb42a;p=git.git

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

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 6ae3bc6e5..6d016b83d 100755
--- 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()