diff options
| author |  Simon Hausmann <shausman@trolltech.com> | 2007-05-23 23:44:19 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-05-23 23:44:19 +0200 |
| commit | ad192f2888816454df14b8a35945fb418bcb9e13 (patch) | |
| tree | 7c3923330c46a7c6f555ed75fbc4c6fdaae0541c /contrib | |
| parent | Catch p4 errors in rollback early enough (before deleting refs!) (diff) | |
| download | tgif-ad192f2888816454df14b8a35945fb418bcb9e13.tar.xz | |
Fix p4 execution in git-p4 rollback.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 6d016b83d4..b2341b7ec4 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -152,7 +152,7 @@ class P4RollBack(Command): return False maxChange = int(args[0]) - if "p4ExitCode" in p4Cmd("p4 changes -m 1"): + if "p4ExitCode" in p4Cmd("changes -m 1"): die("Problems executing p4"); if self.rollbackLocalBranches: |