Fix git-p4 submit

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-06-07 13:09:14 +02:00
parent 68c4215306
commit b0d10df77a

View File

@ -276,6 +276,7 @@ class P4Submit(Command):
self.origin = "" self.origin = ""
self.directSubmit = False self.directSubmit = False
self.trustMeLikeAFool = False self.trustMeLikeAFool = False
self.verbose = False
self.logSubstitutions = {} self.logSubstitutions = {}
self.logSubstitutions["<enter description here>"] = "%log%" self.logSubstitutions["<enter description here>"] = "%log%"
@ -478,9 +479,6 @@ class P4Submit(Command):
% (fileName, fileName)) % (fileName, fileName))
def run(self, args): 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: if len(args) == 0:
self.master = currentGitBranch() self.master = currentGitBranch()
if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master): if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):