diff options
| author | Luke Diamand <luke@diamand.org> | 2016-12-13 21:51:28 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-13 16:04:53 -0800 |
| commit | 378f7be1e74661ff1480cc44a5f039ef85da7288 (patch) | |
| tree | 8299bd02a7799328b59d040a1e4dbfc07d1c4ff4 /t/t9800-git-p4-basic.sh | |
| parent | 8d7a455ed52e2a96debc080dfc011b6bb00db5d2 (diff) | |
| download | git-378f7be1e74661ff1480cc44a5f039ef85da7288.tar.gz | |
git-p4: support git worktreesld/p4-worktree
git-p4 would attempt to find the git directory using
its own specific code, which did not know about git
worktrees.
Rework it to use "git rev-parse --git-dir" instead.
Add test cases for worktree usage and specifying
git directory via --git-dir and $GIT_DIR.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9800-git-p4-basic.sh')
| -rwxr-xr-x | t/t9800-git-p4-basic.sh | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 0730f18d0f..093e9bd586 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -257,6 +257,26 @@ test_expect_success 'submit from detached head' ' ) ' +test_expect_success 'submit from worktree' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + git worktree add ../worktree-test + ) && + ( + cd "$git/../worktree-test" && + test_commit "worktree-commit" && + git config git-p4.skipSubmitEdit true && + git p4 submit + ) && + ( + cd "$cli" && + p4 sync && + test_path_is_file worktree-commit.t + ) +' + test_expect_success 'kill p4d' ' kill_p4d ' |