kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'js/p4-default-branch' 

"git p4" now honors init.defaultBranch configuration.

* js/p4-default-branch:
  p4: respect init.defaultBranch
maint
Junio C Hamano 2020-11-11 13:18:38 -08:00
parent 1e8ed50309 1b09d1917f
commit ca8870d7c1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

@ -4186,7 +4186,7 @@ class P4Clone(P4Sync):


# create a master branch and check out a work tree # create a master branch and check out a work tree
if gitBranchExists(self.branch): if gitBranchExists(self.branch):
system([ "git", "branch", "master", self.branch ]) system([ "git", "branch", currentGitBranch(), self.branch ])
if not self.cloneBare: if not self.cloneBare:
system([ "git", "checkout", "-f" ]) system([ "git", "checkout", "-f" ])
else: else: