diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:24 -0700 |
commit | 36cafe44443fcca9eb35399ef0e9bfe289ec5dde (patch) | |
tree | 527ffefe09206951887018da7c3d8b102bc3830b | |
parent | 3d55eea805c5451afd0a56a4f5aa045ba63083f9 (diff) | |
parent | d604176d23a69c7f690f0379b82b789732a4278f (diff) | |
download | git-36cafe44443fcca9eb35399ef0e9bfe289ec5dde.tar.gz |
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
-rwxr-xr-x | git-p4.py | 2 | ||||
-rwxr-xr-x | t/t9801-git-p4-branch.sh | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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'): diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 0aafd03334..6a86d6996b 100755 --- 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 ) ' |