git-p4: place temporary refs used for branch import under refs/git-p4-tmp

larsxschneider · gitster · commit d604176d23a6 · 2016-07-08T15:28:16.000-07:00
Git-P4 used to place temporary refs under "git-p4-tmp". Since 3da1f37 Git checks that all refs are placed under "refs". Instruct Git-P4 to place temporary refs under "refs/git-p4-tmp". There are no backwards compatibility considerations as these refs are transient. Use "git show-ref --verify" to check the (non-)existience of the refs instead of file checks assuming the file-based ref backend. All refs under "refs" are shared across all worktrees. This is not desired for temporary Git-P4 refs and will be adressed in a later patch. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Reviewed-by: Vitor Antunes <vitor.hda@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/git-p4.py b/git-p4.py
@@ -2274,7 +2274,7 @@ def __init__(self):
         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'):
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
@@ -300,7 +300,7 @@ test_expect_success 'git p4 clone complex branches' '
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
-		test_path_is_missing .git/git-p4-tmp
+		test_must_fail git show-ref --verify refs/git-p4-tmp
 	)
 '
 
@@ -352,7 +352,7 @@ test_expect_success 'git p4 sync changes to two branches in the same changelist'
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
 		! grep update file2 &&
-		test_path_is_missing .git/git-p4-tmp
+		test_must_fail git show-ref --verify refs/git-p4-tmp
 	)
 '
 

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ test_expect_success 'git p4 clone complex branches' '`
`300`	`300`	`test_path_is_file file2 &&`
`301`	`301`	`test_path_is_file file3 &&`
`302`	`302`	`! grep update file2 &&`
`303`		`- test_path_is_missing .git/git-p4-tmp`
	`303`	`+ test_must_fail git show-ref --verify refs/git-p4-tmp`
`304`	`304`	`)`
`305`	`305`	`'`
`306`	`306`
`@@ -352,7 +352,7 @@ test_expect_success 'git p4 sync changes to two branches in the same changelist'`
`352`	`352`	`test_path_is_file file2 &&`
`353`	`353`	`test_path_is_file file3 &&`
`354`	`354`	`! grep update file2 &&`
`355`		`- test_path_is_missing .git/git-p4-tmp`
	`355`	`+ test_must_fail git show-ref --verify refs/git-p4-tmp`
`356`	`356`	`)`
`357`	`357`	`'`
`358`	`358`