diff options
| author | Simon Hausmann <shausman@trolltech.com> | 2007-05-23 23:40:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-05-23 23:40:48 +0200 |
| commit | 66a2f523958129e9b697d30ed44a5174010cb42a (patch) | |
| tree | 5fcbf95138fc51ef07e5d121ef0825f04c7c9f6a | |
| parent | ac3e0d79eef4535bb61d79315688fb1d225dea3b (diff) | |
| download | git-66a2f523958129e9b697d30ed44a5174010cb42a.tar.gz git-66a2f523958129e9b697d30ed44a5174010cb42a.tar.xz | |
Catch p4 errors in rollback early enough (before deleting refs!)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 3 |
1 files changed, 3 insertions, 0 deletions
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() |