summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Simon Hausmann <simon@lst.de>2007-05-25 08:49:18 +0200
committerLibravatar Simon Hausmann <simon@lst.de>2007-05-25 08:49:18 +0200
commit4280e5333354c6dddcd994bdacd3c6a11ac2da5e (patch)
treecf69711d8ab4f7a8c9fb0baebc06e650ae236bb6
parentAvoid creating non-p4 branches in remotes/p4 off of remotes/origin (diff)
downloadtgif-4280e5333354c6dddcd994bdacd3c6a11ac2da5e.tar.xz
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>
-rwxr-xr-xcontrib/fast-import/git-p44
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 1cce38a6f7..e8a5c1fa31 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -412,7 +412,7 @@ class P4Submit(Command):
if len(args) == 0:
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!")
elif len(args) == 1:
self.master = args[0]
@@ -812,7 +812,7 @@ class P4Sync(Command):
continue
update = False
- if not os.path.exists(gitdir + "/" + remoteHead):
+ if not gitBranchExists(remoteHead):
if self.verbose:
print "creating %s" % remoteHead
update = True