summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorSimon Hausmann <shausman@trolltech.com>2007-06-07 11:09:14 (GMT)
committerSimon Hausmann <shausman@trolltech.com>2007-06-07 11:09:14 (GMT)
commitb0d10df77a1130bdf3b4f59fdc18312432b90823 (patch)
tree8b79a7ff7960a22bd1183bbe285d906453c5faad /contrib
parent68c42153060cab9ea6c16256febcf736a2a710d9 (diff)
downloadgit-b0d10df77a1130bdf3b4f59fdc18312432b90823.zip
git-b0d10df77a1130bdf3b4f59fdc18312432b90823.tar.gz
git-b0d10df77a1130bdf3b4f59fdc18312432b90823.tar.bz2
Fix git-p4 submit
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p44
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 50d92c0..8be0afe 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):