summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-11 21:18:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-11 21:18:38 (GMT)
commitca8870d7c198b658a0e3004e27d1c36305702f7f (patch)
treedc51d4ab2b01c52522e9b6b9536e5657385bf4b5 /git-p4.py
parent1e8ed50309ad7975a855383332c6c09b17eb73be (diff)
parent1b09d1917f376d52e191102509d08303f8d26388 (diff)
downloadgit-ca8870d7c198b658a0e3004e27d1c36305702f7f.zip
git-ca8870d7c198b658a0e3004e27d1c36305702f7f.tar.gz
git-ca8870d7c198b658a0e3004e27d1c36305702f7f.tar.bz2
Merge branch 'js/p4-default-branch'
"git p4" now honors init.defaultBranch configuration. * js/p4-default-branch: p4: respect init.defaultBranch
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index 8af92a5..6ae5bbf 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -4186,7 +4186,7 @@ class P4Clone(P4Sync):
# create a master branch and check out a work tree
if gitBranchExists(self.branch):
- system([ "git", "branch", "master", self.branch ])
+ system([ "git", "branch", currentGitBranch(), self.branch ])
if not self.cloneBare:
system([ "git", "checkout", "-f" ])
else: