From: Simon Hausmann <shausman@trolltech.com>
Date: Thu, 7 Jun 2007 11:09:14 +0000 (+0200)
Subject: Fix git-p4 submit
X-Git-Tag: v1.5.3-rc0~65^2^2~20^2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b0d10df77a1130bdf3b4f59fdc18312432b90823;p=git.git

Fix git-p4 submit

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 50d92c0f4..8be0afe82 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -276,6 +276,7 @@ class P4Submit(Command):
         self.origin = ""
         self.directSubmit = False
         self.trustMeLikeAFool = False
+        self.verbose = False
 
         self.logSubstitutions = {}
         self.logSubstitutions["<enter description here>"] = "%log%"
@@ -478,9 +479,6 @@ class P4Submit(Command):
                    % (fileName, fileName))
 
     def run(self, args):
-        # make gitdir absolute so we can cd out into the perforce checkout
-        os.environ["GIT_DIR"] = gitdir
-
         if len(args) == 0:
             self.master = currentGitBranch()
             if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):