From 244b953db5633344a940556798992691ac4ac8fe Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 23 May 2007 23:40:48 +0200 Subject: [PATCH] Catch p4 errors in rollback early enough (before deleting refs!) --- git-p4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-p4 b/git-p4 index 6ae3bc6..6d016b8 100755 --- a/git-p4 +++ b/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() -- 2.11.0