aboutsummaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-19 13:22:24 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-19 13:22:24 -0700
commit36cafe44443fcca9eb35399ef0e9bfe289ec5dde (patch)
tree527ffefe09206951887018da7c3d8b102bc3830b /git-p4.py
parent3d55eea805c5451afd0a56a4f5aa045ba63083f9 (diff)
parentd604176d23a69c7f690f0379b82b789732a4278f (diff)
downloadgit-36cafe44443fcca9eb35399ef0e9bfe289ec5dde.tar.gz
git-36cafe44443fcca9eb35399ef0e9bfe289ec5dde.tar.xz
Merge branch 'ls/p4-tmp-refs'
"git p4" used a location outside $GIT_DIR/refs/ to place its temporary branches, which has been moved to refs/git-p4-tmp/. * ls/p4-tmp-refs: git-p4: place temporary refs used for branch import under refs/git-p4-tmp
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 b123aa272..ac6f4c14f 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -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'):