From: Simon Hausmann <shausman@trolltech.com>
Date: Wed, 23 May 2007 21:44:19 +0000 (+0200)
Subject: Fix p4 execution in git-p4 rollback.
X-Git-Tag: v1.5.3-rc0~65^2^2~65
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ad192f2888816454df14b8a35945fb418bcb9e13;p=git.git

Fix p4 execution in git-p4 rollback.

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 6d016b83d..b2341b7ec 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: