Skip to content

Commit 36cafe4

Browse files
committed
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
2 parents 3d55eea + d604176 commit 36cafe4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

git-p4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,7 @@ def __init__(self):
22742274
self.useClientSpec_from_options = False
22752275
self.clientSpecDirs = None
22762276
self.tempBranches = []
2277-
self.tempBranchLocation = "git-p4-tmp"
2277+
self.tempBranchLocation = "refs/git-p4-tmp"
22782278
self.largeFileSystem = None
22792279

22802280
if gitConfig('git-p4.largeFileSystem'):

t/t9801-git-p4-branch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ test_expect_success 'git p4 clone complex branches' '
300300
test_path_is_file file2 &&
301301
test_path_is_file file3 &&
302302
! grep update file2 &&
303-
test_path_is_missing .git/git-p4-tmp
303+
test_must_fail git show-ref --verify refs/git-p4-tmp
304304
)
305305
'
306306

@@ -352,7 +352,7 @@ test_expect_success 'git p4 sync changes to two branches in the same changelist'
352352
test_path_is_file file2 &&
353353
test_path_is_file file3 &&
354354
! grep update file2 &&
355-
test_path_is_missing .git/git-p4-tmp
355+
test_must_fail git show-ref --verify refs/git-p4-tmp
356356
)
357357
'
358358

0 commit comments

Comments
 (0)