git.samba.org
/
jelmer
/
fast-export.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make git-p4 work with packed refs (don't use os.path.exists to check for the
[jelmer/fast-export.git]
/
git-p4
diff --git
a/git-p4
b/git-p4
index 1cce38a6f7d77cd4dd317c79e474d1e7b0d5de1f..e8a5c1fa316f2ac5be4fa32b145d233db31252a5 100755
(executable)
--- a/
git-p4
+++ b/
git-p4
@@
-412,7
+412,7
@@
class P4Submit(Command):
if len(args) == 0:
self.master = currentGitBranch()
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]
die("Detecting current git branch failed!")
elif len(args) == 1:
self.master = args[0]
@@
-812,7
+812,7
@@
class P4Sync(Command):
continue
update = False
continue
update = False
- if not
os.path.exists(gitdir + "/" +
remoteHead):
+ if not
gitBranchExists(
remoteHead):
if self.verbose:
print "creating %s" % remoteHead
update = True
if self.verbose:
print "creating %s" % remoteHead
update = True