diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2015-07-06 17:30:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-06 18:07:47 (GMT) |
| commit | f194b1ef6ee81788a45053fa6f7409233fc54276 (patch) | |
| tree | b342704c6d1ea4b0309718c6f21f7cf7b6839199 /t/t7410-submodule-checkout-to.sh | |
| parent | cbdf60fa183e3a2330849046846b400ef4a99c3b (diff) | |
| download | git-f194b1ef6ee81788a45053fa6f7409233fc54276.zip git-f194b1ef6ee81788a45053fa6f7409233fc54276.tar.gz git-f194b1ef6ee81788a45053fa6f7409233fc54276.tar.bz2 | |
tests: worktree: retrofit "checkout --to" tests for "worktree add"
With the introduction of "git worktree add", "git checkout --to" is
slated for removal. Therefore, retrofit linked worktree creation tests
to use "git worktree add" instead.
(The test to check exclusivity of "checkout --to" and "checkout <paths>"
is dropped altogether since it becomes meaningless with retirement of
"checkout --to".)
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7410-submodule-checkout-to.sh')
| -rwxr-xr-x | t/t7410-submodule-checkout-to.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7410-submodule-checkout-to.sh b/t/t7410-submodule-checkout-to.sh index 8f30aed..3f609e8 100755 --- a/t/t7410-submodule-checkout-to.sh +++ b/t/t7410-submodule-checkout-to.sh @@ -33,7 +33,7 @@ rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1 test_expect_success 'checkout main' \ 'mkdir default_checkout && (cd clone/main && - git checkout --to "$base_path/default_checkout/main" "$rev1_hash_main")' + git worktree add "$base_path/default_checkout/main" "$rev1_hash_main")' test_expect_failure 'can see submodule diffs just after checkout' \ '(cd default_checkout/main && git diff --submodule master"^!" | grep "file1 updated")' @@ -41,7 +41,7 @@ test_expect_failure 'can see submodule diffs just after checkout' \ test_expect_success 'checkout main and initialize independed clones' \ 'mkdir fully_cloned_submodule && (cd clone/main && - git checkout --to "$base_path/fully_cloned_submodule/main" "$rev1_hash_main") && + git worktree add "$base_path/fully_cloned_submodule/main" "$rev1_hash_main") && (cd fully_cloned_submodule/main && git submodule update)' test_expect_success 'can see submodule diffs after independed cloning' \ |