diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
commit | 49981d8a250837019b4a14f44d471fc6ff7e334f (patch) | |
tree | c3394268eaaade296d7de692fe7e76bacb3be97b /git-p4.py | |
parent | 0202c411edc25940cc381bf317badcdf67670be4 (diff) | |
parent | 6ebdac1bab966b720d776aa43ca188fe378b1f4b (diff) | |
download | git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.gz git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.xz |
Start maintenance track for 2.10.x series
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1934,7 +1934,7 @@ class P4Submit(Command, P4UserMap): if self.useClientSpec: self.clientSpecDirs = getClientSpec() - # Check for the existance of P4 branches + # Check for the existence of P4 branches branchesDetected = (len(p4BranchesInGit().keys()) > 1) if self.useClientSpec and not branchesDetected: @@ -2274,7 +2274,7 @@ class P4Sync(Command, P4UserMap): self.useClientSpec_from_options = False self.clientSpecDirs = None self.tempBranches = [] - self.tempBranchLocation = "git-p4-tmp" + self.tempBranchLocation = "refs/git-p4-tmp" self.largeFileSystem = None if gitConfig('git-p4.largeFileSystem'): |