diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-15 15:43:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-15 15:43:32 -0700 |
| commit | 1c630badacc2de43b03212bcca0f3a9ec99fba13 (patch) | |
| tree | 7e11d8ed8359f7bdf82bb40039d5635841ef2572 /t | |
| parent | Third batch for 2.7 (diff) | |
| parent | path: implement common_dir handling in git_pathdup_submodule() (diff) | |
| download | tgif-1c630badacc2de43b03212bcca0f3a9ec99fba13.tar.xz | |
Merge branch 'mk/submodule-gitdir-path'
The submodule code has been taught to work better with separate
work trees created via "git worktree add".
* mk/submodule-gitdir-path:
path: implement common_dir handling in git_pathdup_submodule()
submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7410-submodule-checkout-to.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t7410-submodule-checkout-to.sh b/t/t7410-submodule-checkout-to.sh index 3f609e8909..1acef32647 100755 --- a/t/t7410-submodule-checkout-to.sh +++ b/t/t7410-submodule-checkout-to.sh @@ -47,4 +47,14 @@ test_expect_success 'checkout main and initialize independed clones' \ test_expect_success 'can see submodule diffs after independed cloning' \ '(cd fully_cloned_submodule/main && git diff --submodule master"^!" | grep "file1 updated")' +test_expect_success 'checkout sub manually' \ + 'mkdir linked_submodule && + (cd clone/main && + git worktree add "$base_path/linked_submodule/main" "$rev1_hash_main") && + (cd clone/main/sub && + git worktree add "$base_path/linked_submodule/main/sub" "$rev1_hash_sub")' + +test_expect_success 'can see submodule diffs after manual checkout of linked submodule' \ + '(cd linked_submodule/main && git diff --submodule master"^!" | grep "file1 updated")' + test_done |