undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix creation of refs/remotes/p4/HEAD symbolic ref

Browse Source 
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-05-27 15:48:01 +02:00
parent cb4f1280dd
commit a3c55c09ec
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/fast-import/git-p4
View File

@ -858,8 +858,6 @@ class P4Sync(Command):
print "Syncing with origin first by calling git fetch origin" print "Syncing with origin first by calling git fetch origin"
system("git fetch origin") system("git fetch origin")
createP4HeadRef = False;
if len(self.branch) == 0: if len(self.branch) == 0:
self.branch = self.refPrefix + "master" self.branch = self.refPrefix + "master"
if gitBranchExists("refs/heads/p4") and self.importIntoRemotes: if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
@ -867,7 +865,7 @@ class P4Sync(Command):
system("git branch -D p4"); system("git branch -D p4");
# create it /after/ importing, when master exists # create it /after/ importing, when master exists
if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes: if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
createP4HeadRef = True system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
if len(args) == 0: if len(args) == 0:
if self.hasOrigin: if self.hasOrigin:
@ -1117,9 +1115,6 @@ class P4Sync(Command):
self.gitOutput.close() self.gitOutput.close()
self.gitError.close() self.gitError.close()
if createP4HeadRef:
system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
return True return True
class P4Rebase(Command): class P4Rebase(Command):