Browse Source

Make git-p4 work with packed refs (don't use os.path.exists to check for the

existance of a ref)

Signed-off-by: Simon Hausmann <simon@lst.de>
maint
Simon Hausmann 18 years ago
parent
commit
4280e53333
  1. 4
      contrib/fast-import/git-p4

4
contrib/fast-import/git-p4

@ -412,7 +412,7 @@ class P4Submit(Command):


if len(args) == 0: if len(args) == 0:
self.master = currentGitBranch() self.master = currentGitBranch()
if len(self.master) == 0 or not os.path.exists("%s/refs/heads/%s" % (gitdir, self.master)): if len(self.master) == 0 or not gitBranchExists("refs/heads/%s" % self.master):
die("Detecting current git branch failed!") die("Detecting current git branch failed!")
elif len(args) == 1: elif len(args) == 1:
self.master = args[0] self.master = args[0]
@ -812,7 +812,7 @@ class P4Sync(Command):
continue continue


update = False update = False
if not os.path.exists(gitdir + "/" + remoteHead): if not gitBranchExists(remoteHead):
if self.verbose: if self.verbose:
print "creating %s" % remoteHead print "creating %s" % remoteHead
update = True update = True

Loading…
Cancel
Save