| 1 | #!/bin/sh |
| 2 | |
| 3 | test_description='test git worktree add' |
| 4 | |
| 5 | GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main |
| 6 | export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME |
| 7 | |
| 8 | TEST_CREATE_REPO_NO_TEMPLATE=1 |
| 9 | . ./test-lib.sh |
| 10 | |
| 11 | . "$TEST_DIRECTORY"/lib-rebase.sh |
| 12 | |
| 13 | test_expect_success 'setup' ' |
| 14 | test_commit init |
| 15 | ' |
| 16 | |
| 17 | test_expect_success '"add" an existing worktree' ' |
| 18 | mkdir -p existing/subtree && |
| 19 | test_must_fail git worktree add --detach existing main |
| 20 | ' |
| 21 | |
| 22 | test_expect_success '"add" an existing empty worktree' ' |
| 23 | mkdir existing_empty && |
| 24 | git worktree add --detach existing_empty main |
| 25 | ' |
| 26 | |
| 27 | test_expect_success '"add" using shorthand - fails when no previous branch' ' |
| 28 | test_must_fail git worktree add existing_short - |
| 29 | ' |
| 30 | |
| 31 | test_expect_success '"add" using - shorthand' ' |
| 32 | git checkout -b newbranch && |
| 33 | echo hello >myworld && |
| 34 | git add myworld && |
| 35 | git commit -m myworld && |
| 36 | git checkout main && |
| 37 | git worktree add short-hand - && |
| 38 | echo refs/heads/newbranch >expect && |
| 39 | git -C short-hand rev-parse --symbolic-full-name HEAD >actual && |
| 40 | test_cmp expect actual |
| 41 | ' |
| 42 | |
| 43 | test_expect_success '"add" refuses to checkout locked branch' ' |
| 44 | test_must_fail git worktree add zere main && |
| 45 | test_path_is_missing zere && |
| 46 | test_path_is_missing .git/worktrees/zere |
| 47 | ' |
| 48 | |
| 49 | test_expect_success 'checking out paths not complaining about linked checkouts' ' |
| 50 | ( |
| 51 | cd existing_empty && |
| 52 | echo dirty >>init.t && |
| 53 | git checkout main -- init.t |
| 54 | ) |
| 55 | ' |
| 56 | |
| 57 | test_expect_success '"add" worktree' ' |
| 58 | git rev-parse HEAD >expect && |
| 59 | git worktree add --detach here main && |
| 60 | ( |
| 61 | cd here && |
| 62 | test_cmp ../init.t init.t && |
| 63 | test_must_fail git symbolic-ref HEAD && |
| 64 | git rev-parse HEAD >actual && |
| 65 | test_cmp ../expect actual && |
| 66 | git fsck |
| 67 | ) |
| 68 | ' |
| 69 | |
| 70 | test_expect_success '"add" worktree with lock' ' |
| 71 | git worktree add --detach --lock here-with-lock main && |
| 72 | test_when_finished "git worktree unlock here-with-lock || :" && |
| 73 | test_path_is_file .git/worktrees/here-with-lock/locked |
| 74 | ' |
| 75 | |
| 76 | test_expect_success '"add" worktree with lock and reason' ' |
| 77 | lock_reason="why not" && |
| 78 | git worktree add --detach --lock --reason "$lock_reason" here-with-lock-reason main && |
| 79 | test_when_finished "git worktree unlock here-with-lock-reason || :" && |
| 80 | test_path_is_file .git/worktrees/here-with-lock-reason/locked && |
| 81 | echo "$lock_reason" >expect && |
| 82 | test_cmp expect .git/worktrees/here-with-lock-reason/locked |
| 83 | ' |
| 84 | |
| 85 | test_expect_success '"add" worktree with reason but no lock' ' |
| 86 | test_must_fail git worktree add --detach --reason "why not" here-with-reason-only main && |
| 87 | test_path_is_missing .git/worktrees/here-with-reason-only/locked |
| 88 | ' |
| 89 | |
| 90 | test_expect_success '"add" worktree from a subdir' ' |
| 91 | ( |
| 92 | mkdir sub && |
| 93 | cd sub && |
| 94 | git worktree add --detach here main && |
| 95 | cd here && |
| 96 | test_cmp ../../init.t init.t |
| 97 | ) |
| 98 | ' |
| 99 | |
| 100 | test_expect_success '"add" from a linked checkout' ' |
| 101 | ( |
| 102 | cd here && |
| 103 | git worktree add --detach nested-here main && |
| 104 | cd nested-here && |
| 105 | git fsck |
| 106 | ) |
| 107 | ' |
| 108 | |
| 109 | test_expect_success '"add" worktree creating new branch' ' |
| 110 | git worktree add -b newmain there main && |
| 111 | ( |
| 112 | cd there && |
| 113 | test_cmp ../init.t init.t && |
| 114 | git symbolic-ref HEAD >actual && |
| 115 | echo refs/heads/newmain >expect && |
| 116 | test_cmp expect actual && |
| 117 | git fsck |
| 118 | ) |
| 119 | ' |
| 120 | |
| 121 | test_expect_success 'die the same branch is already checked out' ' |
| 122 | ( |
| 123 | cd here && |
| 124 | test_must_fail git checkout newmain 2>actual && |
| 125 | test_grep "already used by worktree at" actual |
| 126 | ) |
| 127 | ' |
| 128 | |
| 129 | test_expect_success 'refuse to reset a branch in use elsewhere' ' |
| 130 | ( |
| 131 | cd here && |
| 132 | |
| 133 | # we know we are on detached HEAD but just in case ... |
| 134 | git checkout --detach HEAD && |
| 135 | git rev-parse --verify HEAD >old.head && |
| 136 | |
| 137 | git rev-parse --verify refs/heads/newmain >old.branch && |
| 138 | test_must_fail git checkout -B newmain 2>error && |
| 139 | git rev-parse --verify refs/heads/newmain >new.branch && |
| 140 | git rev-parse --verify HEAD >new.head && |
| 141 | |
| 142 | test_grep "already used by worktree at" error && |
| 143 | test_cmp old.branch new.branch && |
| 144 | test_cmp old.head new.head && |
| 145 | |
| 146 | # and we must be still on the same detached HEAD state |
| 147 | test_must_fail git symbolic-ref HEAD |
| 148 | ) |
| 149 | ' |
| 150 | |
| 151 | test_expect_success SYMLINKS 'die the same branch is already checked out (symlink)' ' |
| 152 | head=$(git -C there rev-parse --git-path HEAD) && |
| 153 | ref=$(git -C there symbolic-ref HEAD) && |
| 154 | rm "$head" && |
| 155 | ln -s "$ref" "$head" && |
| 156 | test_must_fail git -C here checkout newmain |
| 157 | ' |
| 158 | |
| 159 | test_expect_success 'not die the same branch is already checked out' ' |
| 160 | ( |
| 161 | cd here && |
| 162 | git worktree add --force anothernewmain newmain |
| 163 | ) |
| 164 | ' |
| 165 | |
| 166 | test_expect_success 'not die on re-checking out current branch' ' |
| 167 | ( |
| 168 | cd there && |
| 169 | git checkout newmain |
| 170 | ) |
| 171 | ' |
| 172 | |
| 173 | test_expect_success '"add" from a bare repo' ' |
| 174 | ( |
| 175 | git clone --bare . bare && |
| 176 | cd bare && |
| 177 | git worktree add -b bare-main ../there2 main |
| 178 | ) |
| 179 | ' |
| 180 | |
| 181 | test_expect_success 'checkout from a bare repo without "add"' ' |
| 182 | ( |
| 183 | cd bare && |
| 184 | test_must_fail git checkout main |
| 185 | ) |
| 186 | ' |
| 187 | |
| 188 | test_expect_success '"add" default branch of a bare repo' ' |
| 189 | ( |
| 190 | git clone --bare . bare2 && |
| 191 | cd bare2 && |
| 192 | git worktree add ../there3 main && |
| 193 | cd ../there3 && |
| 194 | # Simple check that a Git command does not |
| 195 | # immediately fail with the current setup |
| 196 | git status |
| 197 | ) && |
| 198 | cat >expect <<-EOF && |
| 199 | init.t |
| 200 | EOF |
| 201 | ls there3 >actual && |
| 202 | test_cmp expect actual |
| 203 | ' |
| 204 | |
| 205 | test_expect_success '"add" to bare repo with worktree config' ' |
| 206 | ( |
| 207 | git clone --bare . bare3 && |
| 208 | cd bare3 && |
| 209 | git config extensions.worktreeconfig true && |
| 210 | |
| 211 | # Add config values that are erroneous to have in |
| 212 | # a config.worktree file outside of the main |
| 213 | # working tree, to check that Git filters them out |
| 214 | # when copying config during "git worktree add". |
| 215 | git config --worktree core.bare true && |
| 216 | git config --worktree core.worktree "$(pwd)" && |
| 217 | |
| 218 | # We want to check that bogus.key is copied |
| 219 | git config --worktree bogus.key value && |
| 220 | git config --unset core.bare && |
| 221 | git worktree add ../there4 main && |
| 222 | cd ../there4 && |
| 223 | |
| 224 | # Simple check that a Git command does not |
| 225 | # immediately fail with the current setup |
| 226 | git status && |
| 227 | git worktree add --detach ../there5 && |
| 228 | cd ../there5 && |
| 229 | git status |
| 230 | ) && |
| 231 | |
| 232 | # the worktree has the arbitrary value copied. |
| 233 | test_cmp_config -C there4 value bogus.key && |
| 234 | test_cmp_config -C there5 value bogus.key && |
| 235 | |
| 236 | # however, core.bare and core.worktree were removed. |
| 237 | test_must_fail git -C there4 config core.bare && |
| 238 | test_must_fail git -C there4 config core.worktree && |
| 239 | |
| 240 | cat >expect <<-EOF && |
| 241 | init.t |
| 242 | EOF |
| 243 | |
| 244 | ls there4 >actual && |
| 245 | test_cmp expect actual && |
| 246 | ls there5 >actual && |
| 247 | test_cmp expect actual |
| 248 | ' |
| 249 | |
| 250 | test_expect_success 'checkout with grafts' ' |
| 251 | test_when_finished rm .git/info/grafts && |
| 252 | test_commit abc && |
| 253 | SHA1=$(git rev-parse HEAD) && |
| 254 | test_commit def && |
| 255 | test_commit xyz && |
| 256 | mkdir .git/info && |
| 257 | echo "$(git rev-parse HEAD) $SHA1" >.git/info/grafts && |
| 258 | cat >expected <<-\EOF && |
| 259 | xyz |
| 260 | abc |
| 261 | EOF |
| 262 | git log --format=%s -2 >actual && |
| 263 | test_cmp expected actual && |
| 264 | git worktree add --detach grafted main && |
| 265 | git --git-dir=grafted/.git log --format=%s -2 >actual && |
| 266 | test_cmp expected actual |
| 267 | ' |
| 268 | |
| 269 | test_expect_success '"add" from relative HEAD' ' |
| 270 | test_commit a && |
| 271 | test_commit b && |
| 272 | test_commit c && |
| 273 | git rev-parse HEAD~1 >expected && |
| 274 | git worktree add relhead HEAD~1 && |
| 275 | git -C relhead rev-parse HEAD >actual && |
| 276 | test_cmp expected actual |
| 277 | ' |
| 278 | |
| 279 | test_expect_success '"add -b" with <branch> omitted' ' |
| 280 | git worktree add -b burble flornk && |
| 281 | test_cmp_rev HEAD burble |
| 282 | ' |
| 283 | |
| 284 | test_expect_success '"add --detach" with <branch> omitted' ' |
| 285 | git worktree add --detach fishhook && |
| 286 | git rev-parse HEAD >expected && |
| 287 | git -C fishhook rev-parse HEAD >actual && |
| 288 | test_cmp expected actual && |
| 289 | test_must_fail git -C fishhook symbolic-ref HEAD |
| 290 | ' |
| 291 | |
| 292 | test_expect_success '"add" with <branch> omitted' ' |
| 293 | git worktree add wiffle/bat && |
| 294 | test_cmp_rev HEAD bat |
| 295 | ' |
| 296 | |
| 297 | test_expect_success '"add" checks out existing branch of dwimd name' ' |
| 298 | git branch dwim HEAD~1 && |
| 299 | git worktree add dwim && |
| 300 | test_cmp_rev HEAD~1 dwim && |
| 301 | ( |
| 302 | cd dwim && |
| 303 | test_cmp_rev HEAD dwim |
| 304 | ) |
| 305 | ' |
| 306 | |
| 307 | test_expect_success '"add <path>" dwim fails with checked out branch' ' |
| 308 | git checkout -b test-branch && |
| 309 | test_must_fail git worktree add test-branch && |
| 310 | test_path_is_missing test-branch |
| 311 | ' |
| 312 | |
| 313 | test_expect_success '"add --force" with existing dwimd name doesnt die' ' |
| 314 | git checkout test-branch && |
| 315 | git worktree add --force test-branch |
| 316 | ' |
| 317 | |
| 318 | test_expect_success '"add" no auto-vivify with --detach and <branch> omitted' ' |
| 319 | git worktree add --detach mish/mash && |
| 320 | test_must_fail git rev-parse mash -- && |
| 321 | test_must_fail git -C mish/mash symbolic-ref HEAD |
| 322 | ' |
| 323 | |
| 324 | # Helper function to test mutually exclusive options. |
| 325 | # |
| 326 | # Note: Quoted arguments containing spaces are not supported. |
| 327 | test_wt_add_excl () { |
| 328 | local opts="$*" && |
| 329 | test_expect_success "'worktree add' with '$opts' has mutually exclusive options" ' |
| 330 | test_must_fail git worktree add $opts 2>actual && |
| 331 | test_grep -E "fatal:( options)? .* cannot be used together" actual |
| 332 | ' |
| 333 | } |
| 334 | |
| 335 | test_wt_add_excl -b poodle -B poodle bamboo main |
| 336 | test_wt_add_excl -b poodle --detach bamboo main |
| 337 | test_wt_add_excl -B poodle --detach bamboo main |
| 338 | test_wt_add_excl --orphan --detach bamboo |
| 339 | test_wt_add_excl --orphan --no-checkout bamboo |
| 340 | test_wt_add_excl --orphan bamboo main |
| 341 | test_wt_add_excl --orphan -b bamboo wtdir/ main |
| 342 | |
| 343 | test_expect_success '"add -B" fails if the branch is checked out' ' |
| 344 | git rev-parse newmain >before && |
| 345 | test_must_fail git worktree add -B newmain bamboo main && |
| 346 | git rev-parse newmain >after && |
| 347 | test_cmp before after |
| 348 | ' |
| 349 | |
| 350 | test_expect_success 'add -B' ' |
| 351 | git worktree add -B poodle bamboo2 main^ && |
| 352 | git -C bamboo2 symbolic-ref HEAD >actual && |
| 353 | echo refs/heads/poodle >expected && |
| 354 | test_cmp expected actual && |
| 355 | test_cmp_rev main^ poodle |
| 356 | ' |
| 357 | |
| 358 | test_expect_success 'add --quiet' ' |
| 359 | test_when_finished "git worktree remove -f -f another-worktree" && |
| 360 | git worktree add --quiet another-worktree main 2>actual && |
| 361 | test_must_be_empty actual |
| 362 | ' |
| 363 | |
| 364 | test_expect_success 'add --quiet -b' ' |
| 365 | test_when_finished "git branch -D quietnewbranch" && |
| 366 | test_when_finished "git worktree remove -f -f another-worktree" && |
| 367 | git worktree add --quiet -b quietnewbranch another-worktree 2>actual && |
| 368 | test_must_be_empty actual |
| 369 | ' |
| 370 | |
| 371 | test_expect_success '"add --orphan"' ' |
| 372 | test_when_finished "git worktree remove -f -f orphandir" && |
| 373 | git worktree add --orphan -b neworphan orphandir && |
| 374 | echo refs/heads/neworphan >expected && |
| 375 | git -C orphandir symbolic-ref HEAD >actual && |
| 376 | test_cmp expected actual |
| 377 | ' |
| 378 | |
| 379 | test_expect_success '"add --orphan (no -b)"' ' |
| 380 | test_when_finished "git worktree remove -f -f neworphan" && |
| 381 | git worktree add --orphan neworphan && |
| 382 | echo refs/heads/neworphan >expected && |
| 383 | git -C neworphan symbolic-ref HEAD >actual && |
| 384 | test_cmp expected actual |
| 385 | ' |
| 386 | |
| 387 | test_expect_success '"add --orphan --quiet"' ' |
| 388 | test_when_finished "git worktree remove -f -f orphandir" && |
| 389 | git worktree add --quiet --orphan -b neworphan orphandir 2>log.actual && |
| 390 | test_must_be_empty log.actual && |
| 391 | echo refs/heads/neworphan >expected && |
| 392 | git -C orphandir symbolic-ref HEAD >actual && |
| 393 | test_cmp expected actual |
| 394 | ' |
| 395 | |
| 396 | test_expect_success '"add --orphan" fails if the branch already exists' ' |
| 397 | test_when_finished "git branch -D existingbranch" && |
| 398 | git worktree add -b existingbranch orphandir main && |
| 399 | git worktree remove orphandir && |
| 400 | test_must_fail git worktree add --orphan -b existingbranch orphandir |
| 401 | ' |
| 402 | |
| 403 | test_expect_success '"add --orphan" with empty repository' ' |
| 404 | test_when_finished "rm -rf empty_repo" && |
| 405 | echo refs/heads/newbranch >expected && |
| 406 | GIT_DIR="empty_repo" git init --bare && |
| 407 | git -C empty_repo worktree add --orphan -b newbranch worktreedir && |
| 408 | git -C empty_repo/worktreedir symbolic-ref HEAD >actual && |
| 409 | test_cmp expected actual |
| 410 | ' |
| 411 | |
| 412 | test_expect_success '"add" worktree with orphan branch and lock' ' |
| 413 | git worktree add --lock --orphan -b orphanbr orphan-with-lock && |
| 414 | test_when_finished "git worktree unlock orphan-with-lock || :" && |
| 415 | test_path_is_file .git/worktrees/orphan-with-lock/locked |
| 416 | ' |
| 417 | |
| 418 | test_expect_success '"add" worktree with orphan branch, lock, and reason' ' |
| 419 | lock_reason="why not" && |
| 420 | git worktree add --detach --lock --reason "$lock_reason" orphan-with-lock-reason main && |
| 421 | test_when_finished "git worktree unlock orphan-with-lock-reason || :" && |
| 422 | test_path_is_file .git/worktrees/orphan-with-lock-reason/locked && |
| 423 | echo "$lock_reason" >expect && |
| 424 | test_cmp expect .git/worktrees/orphan-with-lock-reason/locked |
| 425 | ' |
| 426 | |
| 427 | # Note: Quoted arguments containing spaces are not supported. |
| 428 | test_wt_add_orphan_hint () { |
| 429 | local context="$1" && |
| 430 | local use_branch="$2" && |
| 431 | shift 2 && |
| 432 | local opts="$*" && |
| 433 | test_expect_success "'worktree add' show orphan hint in bad/orphan HEAD w/ $context" ' |
| 434 | test_when_finished "rm -rf repo" && |
| 435 | git init repo && |
| 436 | (cd repo && test_commit commit) && |
| 437 | git -C repo switch --orphan noref && |
| 438 | test_must_fail git -C repo worktree add $opts foobar/ 2>actual && |
| 439 | test_grep ! "error: unknown switch" actual && |
| 440 | test_grep "hint: If you meant to create a worktree containing a new unborn branch" actual && |
| 441 | if [ $use_branch -eq 1 ] |
| 442 | then |
| 443 | test_grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual |
| 444 | else |
| 445 | test_grep -E "^hint: +git worktree add --orphan [^ ]+$" actual |
| 446 | fi |
| 447 | |
| 448 | ' |
| 449 | } |
| 450 | |
| 451 | test_wt_add_orphan_hint 'no opts' 0 |
| 452 | test_wt_add_orphan_hint '-b' 1 -b foobar_branch |
| 453 | test_wt_add_orphan_hint '-B' 1 -B foobar_branch |
| 454 | |
| 455 | test_expect_success "'worktree add' doesn't show orphan hint in bad/orphan HEAD w/ --quiet" ' |
| 456 | test_when_finished "rm -rf repo" && |
| 457 | git init repo && |
| 458 | (cd repo && test_commit commit) && |
| 459 | test_must_fail git -C repo worktree add --quiet foobar_branch foobar/ 2>actual && |
| 460 | test_grep ! "error: unknown switch" actual && |
| 461 | test_grep ! "hint: If you meant to create a worktree containing a new unborn branch" actual |
| 462 | ' |
| 463 | |
| 464 | test_expect_success 'local clone from linked checkout' ' |
| 465 | git clone --local here here-clone && |
| 466 | ( cd here-clone && git fsck ) |
| 467 | ' |
| 468 | |
| 469 | test_expect_success 'local clone --shared from linked checkout' ' |
| 470 | git -C bare worktree add --detach ../baretree && |
| 471 | git clone --local --shared baretree bare-clone && |
| 472 | test_grep /bare/ bare-clone/.git/objects/info/alternates |
| 473 | ' |
| 474 | |
| 475 | test_expect_success '"add" worktree with --no-checkout' ' |
| 476 | git worktree add --no-checkout -b swamp swamp && |
| 477 | test_path_is_missing swamp/init.t && |
| 478 | git -C swamp reset --hard && |
| 479 | test_cmp init.t swamp/init.t |
| 480 | ' |
| 481 | |
| 482 | test_expect_success '"add" worktree with --checkout' ' |
| 483 | git worktree add --checkout -b swmap2 swamp2 && |
| 484 | test_cmp init.t swamp2/init.t |
| 485 | ' |
| 486 | |
| 487 | test_expect_success 'put a worktree under rebase' ' |
| 488 | git worktree add under-rebase && |
| 489 | ( |
| 490 | cd under-rebase && |
| 491 | set_fake_editor && |
| 492 | FAKE_LINES="edit 1" git rebase -i HEAD^ && |
| 493 | git worktree list >actual && |
| 494 | test_grep "under-rebase.*detached HEAD" actual |
| 495 | ) |
| 496 | ' |
| 497 | |
| 498 | test_expect_success 'add a worktree, checking out a rebased branch' ' |
| 499 | test_must_fail git worktree add new-rebase under-rebase && |
| 500 | test_path_is_missing new-rebase |
| 501 | ' |
| 502 | |
| 503 | test_expect_success 'checking out a rebased branch from another worktree' ' |
| 504 | git worktree add new-place && |
| 505 | test_must_fail git -C new-place checkout under-rebase |
| 506 | ' |
| 507 | |
| 508 | test_expect_success 'not allow to delete a branch under rebase' ' |
| 509 | ( |
| 510 | cd under-rebase && |
| 511 | test_must_fail git branch -D under-rebase |
| 512 | ) |
| 513 | ' |
| 514 | |
| 515 | test_expect_success 'rename a branch under rebase not allowed' ' |
| 516 | test_must_fail git branch -M under-rebase rebase-with-new-name |
| 517 | ' |
| 518 | |
| 519 | test_expect_success 'check out from current worktree branch ok' ' |
| 520 | ( |
| 521 | cd under-rebase && |
| 522 | git checkout under-rebase && |
| 523 | git checkout - && |
| 524 | git rebase --abort |
| 525 | ) |
| 526 | ' |
| 527 | |
| 528 | test_expect_success 'checkout a branch under bisect' ' |
| 529 | git worktree add under-bisect && |
| 530 | ( |
| 531 | cd under-bisect && |
| 532 | git bisect start && |
| 533 | git bisect bad && |
| 534 | git bisect good HEAD~2 && |
| 535 | git worktree list >actual && |
| 536 | test_grep "under-bisect.*detached HEAD" actual && |
| 537 | test_must_fail git worktree add new-bisect under-bisect && |
| 538 | test_path_is_missing new-bisect |
| 539 | ) |
| 540 | ' |
| 541 | |
| 542 | test_expect_success 'rename a branch under bisect not allowed' ' |
| 543 | test_must_fail git branch -M under-bisect bisect-with-new-name |
| 544 | ' |
| 545 | # Is branch "refs/heads/$1" set to pull from "$2/$3"? |
| 546 | test_branch_upstream () { |
| 547 | printf "%s\n" "$2" "refs/heads/$3" >expect.upstream && |
| 548 | { |
| 549 | git config "branch.$1.remote" && |
| 550 | git config "branch.$1.merge" |
| 551 | } >actual.upstream && |
| 552 | test_cmp expect.upstream actual.upstream |
| 553 | } |
| 554 | |
| 555 | test_expect_success '--track sets up tracking' ' |
| 556 | test_when_finished rm -rf track && |
| 557 | git worktree add --track -b track track main && |
| 558 | test_branch_upstream track . main |
| 559 | ' |
| 560 | |
| 561 | # setup remote repository $1 and repository $2 with $1 set up as |
| 562 | # remote. The remote has two branches, main and foo. |
| 563 | setup_remote_repo () { |
| 564 | git init $1 && |
| 565 | ( |
| 566 | cd $1 && |
| 567 | test_commit $1_main && |
| 568 | git checkout -b foo && |
| 569 | test_commit upstream_foo |
| 570 | ) && |
| 571 | git init $2 && |
| 572 | ( |
| 573 | cd $2 && |
| 574 | test_commit $2_main && |
| 575 | git remote add $1 ../$1 && |
| 576 | git config remote.$1.fetch \ |
| 577 | "refs/heads/*:refs/remotes/$1/*" && |
| 578 | git fetch --all |
| 579 | ) |
| 580 | } |
| 581 | |
| 582 | test_expect_success '"add" <path> <remote/branch> w/ no HEAD' ' |
| 583 | test_when_finished rm -rf repo_upstream repo_local foo && |
| 584 | setup_remote_repo repo_upstream repo_local && |
| 585 | git -C repo_local config --bool core.bare true && |
| 586 | git -C repo_local branch -D main && |
| 587 | git -C repo_local worktree add ./foo repo_upstream/foo |
| 588 | ' |
| 589 | |
| 590 | test_expect_success '--no-track avoids setting up tracking' ' |
| 591 | test_when_finished rm -rf repo_upstream repo_local foo && |
| 592 | setup_remote_repo repo_upstream repo_local && |
| 593 | ( |
| 594 | cd repo_local && |
| 595 | git worktree add --no-track -b foo ../foo repo_upstream/foo |
| 596 | ) && |
| 597 | ( |
| 598 | cd foo && |
| 599 | test_must_fail git config "branch.foo.remote" && |
| 600 | test_must_fail git config "branch.foo.merge" && |
| 601 | test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo |
| 602 | ) |
| 603 | ' |
| 604 | |
| 605 | test_expect_success '"add" <path> <non-existent-branch> fails' ' |
| 606 | test_must_fail git worktree add foo non-existent |
| 607 | ' |
| 608 | |
| 609 | test_expect_success '"add" <path> <branch> dwims' ' |
| 610 | test_when_finished rm -rf repo_upstream repo_dwim foo && |
| 611 | setup_remote_repo repo_upstream repo_dwim && |
| 612 | git init repo_dwim && |
| 613 | ( |
| 614 | cd repo_dwim && |
| 615 | git worktree add ../foo foo |
| 616 | ) && |
| 617 | ( |
| 618 | cd foo && |
| 619 | test_branch_upstream foo repo_upstream foo && |
| 620 | test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo |
| 621 | ) |
| 622 | ' |
| 623 | |
| 624 | test_expect_success '"add" <path> <branch> dwims with checkout.defaultRemote' ' |
| 625 | test_when_finished rm -rf repo_upstream repo_dwim foo && |
| 626 | setup_remote_repo repo_upstream repo_dwim && |
| 627 | git init repo_dwim && |
| 628 | ( |
| 629 | cd repo_dwim && |
| 630 | git remote add repo_upstream2 ../repo_upstream && |
| 631 | git fetch repo_upstream2 && |
| 632 | test_must_fail git worktree add ../foo foo && |
| 633 | git -c checkout.defaultRemote=repo_upstream worktree add ../foo foo && |
| 634 | git status -uno --porcelain >status.actual && |
| 635 | test_must_be_empty status.actual |
| 636 | ) && |
| 637 | ( |
| 638 | cd foo && |
| 639 | test_branch_upstream foo repo_upstream foo && |
| 640 | test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo |
| 641 | ) |
| 642 | ' |
| 643 | |
| 644 | test_expect_success 'git worktree add does not match remote' ' |
| 645 | test_when_finished rm -rf repo_a repo_b foo && |
| 646 | setup_remote_repo repo_a repo_b && |
| 647 | ( |
| 648 | cd repo_b && |
| 649 | git worktree add ../foo |
| 650 | ) && |
| 651 | ( |
| 652 | cd foo && |
| 653 | test_must_fail git config "branch.foo.remote" && |
| 654 | test_must_fail git config "branch.foo.merge" && |
| 655 | test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo |
| 656 | ) |
| 657 | ' |
| 658 | |
| 659 | test_expect_success 'git worktree add --guess-remote sets up tracking' ' |
| 660 | test_when_finished rm -rf repo_a repo_b foo && |
| 661 | setup_remote_repo repo_a repo_b && |
| 662 | ( |
| 663 | cd repo_b && |
| 664 | git worktree add --guess-remote ../foo |
| 665 | ) && |
| 666 | ( |
| 667 | cd foo && |
| 668 | test_branch_upstream foo repo_a foo && |
| 669 | test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo |
| 670 | ) |
| 671 | ' |
| 672 | test_expect_success 'git worktree add --guess-remote sets up tracking (quiet)' ' |
| 673 | test_when_finished rm -rf repo_a repo_b foo && |
| 674 | setup_remote_repo repo_a repo_b && |
| 675 | ( |
| 676 | cd repo_b && |
| 677 | git worktree add --quiet --guess-remote ../foo 2>actual && |
| 678 | test_must_be_empty actual |
| 679 | ) && |
| 680 | ( |
| 681 | cd foo && |
| 682 | test_branch_upstream foo repo_a foo && |
| 683 | test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo |
| 684 | ) |
| 685 | ' |
| 686 | |
| 687 | test_expect_success 'git worktree --no-guess-remote (quiet)' ' |
| 688 | test_when_finished rm -rf repo_a repo_b foo && |
| 689 | setup_remote_repo repo_a repo_b && |
| 690 | ( |
| 691 | cd repo_b && |
| 692 | git worktree add --quiet --no-guess-remote ../foo |
| 693 | ) && |
| 694 | ( |
| 695 | cd foo && |
| 696 | test_must_fail git config "branch.foo.remote" && |
| 697 | test_must_fail git config "branch.foo.merge" && |
| 698 | test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo |
| 699 | ) |
| 700 | ' |
| 701 | |
| 702 | test_expect_success 'git worktree add with worktree.guessRemote sets up tracking' ' |
| 703 | test_when_finished rm -rf repo_a repo_b foo && |
| 704 | setup_remote_repo repo_a repo_b && |
| 705 | ( |
| 706 | cd repo_b && |
| 707 | git config worktree.guessRemote true && |
| 708 | git worktree add ../foo |
| 709 | ) && |
| 710 | ( |
| 711 | cd foo && |
| 712 | test_branch_upstream foo repo_a foo && |
| 713 | test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo |
| 714 | ) |
| 715 | ' |
| 716 | |
| 717 | test_expect_success 'git worktree --no-guess-remote option overrides config' ' |
| 718 | test_when_finished rm -rf repo_a repo_b foo && |
| 719 | setup_remote_repo repo_a repo_b && |
| 720 | ( |
| 721 | cd repo_b && |
| 722 | git config worktree.guessRemote true && |
| 723 | git worktree add --no-guess-remote ../foo |
| 724 | ) && |
| 725 | ( |
| 726 | cd foo && |
| 727 | test_must_fail git config "branch.foo.remote" && |
| 728 | test_must_fail git config "branch.foo.merge" && |
| 729 | test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo |
| 730 | ) |
| 731 | ' |
| 732 | |
| 733 | test_dwim_orphan () { |
| 734 | local info_text="No possible source branch, inferring '--orphan'" && |
| 735 | local fetch_error_text="fatal: No local or remote refs exist despite at least one remote" && |
| 736 | local orphan_hint="hint: If you meant to create a worktree containing a new unborn branch" && |
| 737 | local invalid_ref_regex="^fatal: invalid reference: " && |
| 738 | local bad_combo_regex="^fatal: options '[-a-z]*' and '[-a-z]*' cannot be used together" && |
| 739 | |
| 740 | local git_ns="repo" && |
| 741 | local dashc_args="-C $git_ns" && |
| 742 | local use_cd=0 && |
| 743 | |
| 744 | local bad_head=0 && |
| 745 | local empty_repo=1 && |
| 746 | local local_ref=0 && |
| 747 | local use_quiet=0 && |
| 748 | local remote=0 && |
| 749 | local remote_ref=0 && |
| 750 | local use_detach=0 && |
| 751 | local use_new_branch=0 && |
| 752 | |
| 753 | local outcome="$1" && |
| 754 | local outcome_text && |
| 755 | local success && |
| 756 | shift && |
| 757 | local args="" && |
| 758 | local context="" && |
| 759 | case "$outcome" in |
| 760 | "infer") |
| 761 | success=1 && |
| 762 | outcome_text='"add" DWIM infer --orphan' |
| 763 | ;; |
| 764 | "no_infer") |
| 765 | success=1 && |
| 766 | outcome_text='"add" DWIM doesnt infer --orphan' |
| 767 | ;; |
| 768 | "fetch_error") |
| 769 | success=0 && |
| 770 | outcome_text='"add" error need fetch' |
| 771 | ;; |
| 772 | "fatal_orphan_bad_combo") |
| 773 | success=0 && |
| 774 | outcome_text='"add" error inferred "--orphan" gives illegal opts combo' |
| 775 | ;; |
| 776 | "warn_bad_head") |
| 777 | success=0 && |
| 778 | outcome_text='"add" error, warn on bad HEAD, hint use orphan' |
| 779 | ;; |
| 780 | *) |
| 781 | echo "test_dwim_orphan(): invalid outcome: '$outcome'" >&2 && |
| 782 | return 1 |
| 783 | ;; |
| 784 | esac && |
| 785 | while [ $# -gt 0 ] |
| 786 | do |
| 787 | case "$1" in |
| 788 | # How and from where to create the worktree |
| 789 | "-C_repo") |
| 790 | use_cd=0 && |
| 791 | git_ns="repo" && |
| 792 | dashc_args="-C $git_ns" && |
| 793 | context="$context, 'git -C repo'" |
| 794 | ;; |
| 795 | "-C_wt") |
| 796 | use_cd=0 && |
| 797 | git_ns="wt" && |
| 798 | dashc_args="-C $git_ns" && |
| 799 | context="$context, 'git -C wt'" |
| 800 | ;; |
| 801 | "cd_repo") |
| 802 | use_cd=1 && |
| 803 | git_ns="repo" && |
| 804 | dashc_args="" && |
| 805 | context="$context, 'cd repo && git'" |
| 806 | ;; |
| 807 | "cd_wt") |
| 808 | use_cd=1 && |
| 809 | git_ns="wt" && |
| 810 | dashc_args="" && |
| 811 | context="$context, 'cd wt && git'" |
| 812 | ;; |
| 813 | |
| 814 | # Bypass the "pull first" warning |
| 815 | "force") |
| 816 | args="$args --force" && |
| 817 | context="$context, --force" |
| 818 | ;; |
| 819 | |
| 820 | # Try to use remote refs when DWIM |
| 821 | "guess_remote") |
| 822 | args="$args --guess-remote" && |
| 823 | context="$context, --guess-remote" |
| 824 | ;; |
| 825 | "no_guess_remote") |
| 826 | args="$args --no-guess-remote" && |
| 827 | context="$context, --no-guess-remote" |
| 828 | ;; |
| 829 | |
| 830 | # Whether there is at least one local branch present |
| 831 | "local_ref") |
| 832 | empty_repo=0 && |
| 833 | local_ref=1 && |
| 834 | context="$context, >=1 local branches" |
| 835 | ;; |
| 836 | "no_local_ref") |
| 837 | empty_repo=0 && |
| 838 | context="$context, 0 local branches" |
| 839 | ;; |
| 840 | |
| 841 | # Whether the HEAD points at a valid ref (skip this opt when no refs) |
| 842 | "good_head") |
| 843 | # requires: local_ref |
| 844 | context="$context, valid HEAD" |
| 845 | ;; |
| 846 | "bad_head") |
| 847 | bad_head=1 && |
| 848 | context="$context, invalid (or orphan) HEAD" |
| 849 | ;; |
| 850 | |
| 851 | # Whether the code path is tested with the base add command, -b, or --detach |
| 852 | "no_-b") |
| 853 | use_new_branch=0 && |
| 854 | context="$context, no --branch" |
| 855 | ;; |
| 856 | "-b") |
| 857 | use_new_branch=1 && |
| 858 | context="$context, --branch" |
| 859 | ;; |
| 860 | "detach") |
| 861 | use_detach=1 && |
| 862 | context="$context, --detach" |
| 863 | ;; |
| 864 | |
| 865 | # Whether to check that all output is suppressed (except errors) |
| 866 | # or that the output is as expected |
| 867 | "quiet") |
| 868 | use_quiet=1 && |
| 869 | args="$args --quiet" && |
| 870 | context="$context, --quiet" |
| 871 | ;; |
| 872 | "no_quiet") |
| 873 | use_quiet=0 && |
| 874 | context="$context, no --quiet (expect output)" |
| 875 | ;; |
| 876 | |
| 877 | # Whether there is at least one remote attached to the repo |
| 878 | "remote") |
| 879 | empty_repo=0 && |
| 880 | remote=1 && |
| 881 | context="$context, >=1 remotes" |
| 882 | ;; |
| 883 | "no_remote") |
| 884 | empty_repo=0 && |
| 885 | remote=0 && |
| 886 | context="$context, 0 remotes" |
| 887 | ;; |
| 888 | |
| 889 | # Whether there is at least one valid remote ref |
| 890 | "remote_ref") |
| 891 | # requires: remote |
| 892 | empty_repo=0 && |
| 893 | remote_ref=1 && |
| 894 | context="$context, >=1 fetched remote branches" |
| 895 | ;; |
| 896 | "no_remote_ref") |
| 897 | empty_repo=0 && |
| 898 | remote_ref=0 && |
| 899 | context="$context, 0 fetched remote branches" |
| 900 | ;; |
| 901 | |
| 902 | # Options or flags that become illegal when --orphan is inferred |
| 903 | "no_checkout") |
| 904 | args="$args --no-checkout" && |
| 905 | context="$context, --no-checkout" |
| 906 | ;; |
| 907 | "track") |
| 908 | args="$args --track" && |
| 909 | context="$context, --track" |
| 910 | ;; |
| 911 | |
| 912 | # All other options are illegal |
| 913 | *) |
| 914 | echo "test_dwim_orphan(): invalid arg: '$1'" >&2 && |
| 915 | return 1 |
| 916 | ;; |
| 917 | esac && |
| 918 | shift |
| 919 | done && |
| 920 | context="${context#', '}" && |
| 921 | if [ $use_new_branch -eq 1 ] |
| 922 | then |
| 923 | args="$args -b foo" |
| 924 | elif [ $use_detach -eq 1 ] |
| 925 | then |
| 926 | args="$args --detach" |
| 927 | else |
| 928 | context="DWIM (no --branch), $context" |
| 929 | fi && |
| 930 | if [ $empty_repo -eq 1 ] |
| 931 | then |
| 932 | context="empty repo, $context" |
| 933 | fi && |
| 934 | args="$args ../foo" && |
| 935 | context="${context%', '}" && |
| 936 | test_expect_success "$outcome_text w/ $context" ' |
| 937 | test_when_finished "rm -rf repo" && |
| 938 | git init repo && |
| 939 | if [ $local_ref -eq 1 ] && [ "$git_ns" = "repo" ] |
| 940 | then |
| 941 | (cd repo && test_commit commit) && |
| 942 | if [ $bad_head -eq 1 ] |
| 943 | then |
| 944 | git -C repo symbolic-ref HEAD refs/heads/badbranch |
| 945 | fi |
| 946 | elif [ $local_ref -eq 1 ] && [ "$git_ns" = "wt" ] |
| 947 | then |
| 948 | test_when_finished "git -C repo worktree remove -f ../wt" && |
| 949 | git -C repo worktree add --orphan -b main ../wt && |
| 950 | (cd wt && test_commit commit) && |
| 951 | if [ $bad_head -eq 1 ] |
| 952 | then |
| 953 | git -C wt symbolic-ref HEAD refs/heads/badbranch |
| 954 | fi |
| 955 | elif [ $local_ref -eq 0 ] && [ "$git_ns" = "wt" ] |
| 956 | then |
| 957 | test_when_finished "git -C repo worktree remove -f ../wt" && |
| 958 | git -C repo worktree add --orphan -b orphanbranch ../wt |
| 959 | fi && |
| 960 | |
| 961 | if [ $remote -eq 1 ] |
| 962 | then |
| 963 | test_when_finished "rm -rf upstream" && |
| 964 | git init upstream && |
| 965 | (cd upstream && test_commit commit) && |
| 966 | git -C upstream switch -c foo && |
| 967 | git -C repo remote add upstream ../upstream |
| 968 | fi && |
| 969 | |
| 970 | if [ $remote_ref -eq 1 ] |
| 971 | then |
| 972 | git -C repo fetch |
| 973 | fi && |
| 974 | if [ $success -eq 1 ] |
| 975 | then |
| 976 | test_when_finished git -C repo worktree remove ../foo |
| 977 | fi && |
| 978 | ( |
| 979 | if [ $use_cd -eq 1 ] |
| 980 | then |
| 981 | cd $git_ns |
| 982 | fi && |
| 983 | if [ "$outcome" = "infer" ] |
| 984 | then |
| 985 | git $dashc_args worktree add $args 2>actual && |
| 986 | if [ $use_quiet -eq 1 ] |
| 987 | then |
| 988 | test_must_be_empty actual |
| 989 | else |
| 990 | test_grep "$info_text" actual |
| 991 | fi |
| 992 | elif [ "$outcome" = "no_infer" ] |
| 993 | then |
| 994 | git $dashc_args worktree add $args 2>actual && |
| 995 | if [ $use_quiet -eq 1 ] |
| 996 | then |
| 997 | test_must_be_empty actual |
| 998 | else |
| 999 | test_grep ! "$info_text" actual |
| 1000 | fi |
| 1001 | elif [ "$outcome" = "fetch_error" ] |
| 1002 | then |
| 1003 | test_must_fail git $dashc_args worktree add $args 2>actual && |
| 1004 | test_grep "$fetch_error_text" actual |
| 1005 | elif [ "$outcome" = "fatal_orphan_bad_combo" ] |
| 1006 | then |
| 1007 | test_must_fail git $dashc_args worktree add $args 2>actual && |
| 1008 | if [ $use_quiet -eq 1 ] |
| 1009 | then |
| 1010 | test_grep ! "$info_text" actual |
| 1011 | else |
| 1012 | test_grep "$info_text" actual |
| 1013 | fi && |
| 1014 | test_grep "$bad_combo_regex" actual |
| 1015 | elif [ "$outcome" = "warn_bad_head" ] |
| 1016 | then |
| 1017 | test_must_fail git $dashc_args worktree add $args 2>actual && |
| 1018 | if [ $use_quiet -eq 1 ] |
| 1019 | then |
| 1020 | test_grep "$invalid_ref_regex" actual && |
| 1021 | test_grep ! "$orphan_hint" actual |
| 1022 | else |
| 1023 | test_grep "HEAD points to an invalid (or orphaned) reference" actual && |
| 1024 | test_grep "$orphan_hint" actual && |
| 1025 | test_grep ! "$info_text" actual |
| 1026 | fi && |
| 1027 | test_grep "$invalid_ref_regex" actual |
| 1028 | else |
| 1029 | # Unreachable |
| 1030 | false |
| 1031 | fi |
| 1032 | ) && |
| 1033 | if [ $success -ne 1 ] |
| 1034 | then |
| 1035 | test_path_is_missing foo |
| 1036 | fi |
| 1037 | ' |
| 1038 | } |
| 1039 | |
| 1040 | for quiet_mode in "no_quiet" "quiet" |
| 1041 | do |
| 1042 | for changedir_type in "cd_repo" "cd_wt" "-C_repo" "-C_wt" |
| 1043 | do |
| 1044 | dwim_test_args="$quiet_mode $changedir_type" |
| 1045 | test_dwim_orphan 'infer' $dwim_test_args no_-b |
| 1046 | test_dwim_orphan 'no_infer' $dwim_test_args no_-b local_ref good_head |
| 1047 | test_dwim_orphan 'infer' $dwim_test_args no_-b no_local_ref no_remote no_remote_ref no_guess_remote |
| 1048 | test_dwim_orphan 'infer' $dwim_test_args no_-b no_local_ref remote no_remote_ref no_guess_remote |
| 1049 | test_dwim_orphan 'fetch_error' $dwim_test_args no_-b no_local_ref remote no_remote_ref guess_remote |
| 1050 | test_dwim_orphan 'infer' $dwim_test_args no_-b no_local_ref remote no_remote_ref guess_remote force |
| 1051 | test_dwim_orphan 'no_infer' $dwim_test_args no_-b no_local_ref remote remote_ref guess_remote |
| 1052 | |
| 1053 | test_dwim_orphan 'infer' $dwim_test_args -b |
| 1054 | test_dwim_orphan 'no_infer' $dwim_test_args -b local_ref good_head |
| 1055 | test_dwim_orphan 'infer' $dwim_test_args -b no_local_ref no_remote no_remote_ref no_guess_remote |
| 1056 | test_dwim_orphan 'infer' $dwim_test_args -b no_local_ref remote no_remote_ref no_guess_remote |
| 1057 | test_dwim_orphan 'infer' $dwim_test_args -b no_local_ref remote no_remote_ref guess_remote |
| 1058 | test_dwim_orphan 'infer' $dwim_test_args -b no_local_ref remote remote_ref guess_remote |
| 1059 | |
| 1060 | test_dwim_orphan 'warn_bad_head' $dwim_test_args no_-b local_ref bad_head |
| 1061 | test_dwim_orphan 'warn_bad_head' $dwim_test_args -b local_ref bad_head |
| 1062 | test_dwim_orphan 'warn_bad_head' $dwim_test_args detach local_ref bad_head |
| 1063 | done |
| 1064 | |
| 1065 | test_dwim_orphan 'fatal_orphan_bad_combo' $quiet_mode no_-b no_checkout |
| 1066 | test_dwim_orphan 'fatal_orphan_bad_combo' $quiet_mode no_-b track |
| 1067 | test_dwim_orphan 'fatal_orphan_bad_combo' $quiet_mode -b no_checkout |
| 1068 | test_dwim_orphan 'fatal_orphan_bad_combo' $quiet_mode -b track |
| 1069 | done |
| 1070 | |
| 1071 | post_checkout_hook () { |
| 1072 | test_when_finished "rm -rf .git/hooks" && |
| 1073 | mkdir .git/hooks && |
| 1074 | test_hook -C "$1" post-checkout <<-\EOF |
| 1075 | { |
| 1076 | echo $* |
| 1077 | git rev-parse --git-dir --show-toplevel |
| 1078 | } >hook.actual |
| 1079 | EOF |
| 1080 | } |
| 1081 | |
| 1082 | test_expect_success '"add" invokes post-checkout hook (branch)' ' |
| 1083 | post_checkout_hook && |
| 1084 | { |
| 1085 | echo $ZERO_OID $(git rev-parse HEAD) 1 && |
| 1086 | echo $(pwd)/.git/worktrees/gumby && |
| 1087 | echo $(pwd)/gumby |
| 1088 | } >hook.expect && |
| 1089 | git worktree add gumby && |
| 1090 | test_cmp hook.expect gumby/hook.actual |
| 1091 | ' |
| 1092 | |
| 1093 | test_expect_success '"add" invokes post-checkout hook (detached)' ' |
| 1094 | post_checkout_hook && |
| 1095 | { |
| 1096 | echo $ZERO_OID $(git rev-parse HEAD) 1 && |
| 1097 | echo $(pwd)/.git/worktrees/grumpy && |
| 1098 | echo $(pwd)/grumpy |
| 1099 | } >hook.expect && |
| 1100 | git worktree add --detach grumpy && |
| 1101 | test_cmp hook.expect grumpy/hook.actual |
| 1102 | ' |
| 1103 | |
| 1104 | test_expect_success '"add --no-checkout" suppresses post-checkout hook' ' |
| 1105 | post_checkout_hook && |
| 1106 | rm -f hook.actual && |
| 1107 | git worktree add --no-checkout gloopy && |
| 1108 | test_path_is_missing gloopy/hook.actual |
| 1109 | ' |
| 1110 | |
| 1111 | test_expect_success '"add" in other worktree invokes post-checkout hook' ' |
| 1112 | post_checkout_hook && |
| 1113 | { |
| 1114 | echo $ZERO_OID $(git rev-parse HEAD) 1 && |
| 1115 | echo $(pwd)/.git/worktrees/guppy && |
| 1116 | echo $(pwd)/guppy |
| 1117 | } >hook.expect && |
| 1118 | git -C gloopy worktree add --detach ../guppy && |
| 1119 | test_cmp hook.expect guppy/hook.actual |
| 1120 | ' |
| 1121 | |
| 1122 | test_expect_success '"add" in bare repo invokes post-checkout hook' ' |
| 1123 | rm -rf bare && |
| 1124 | git clone --bare . bare && |
| 1125 | { |
| 1126 | echo $ZERO_OID $(git --git-dir=bare rev-parse HEAD) 1 && |
| 1127 | echo $(pwd)/bare/worktrees/goozy && |
| 1128 | echo $(pwd)/goozy |
| 1129 | } >hook.expect && |
| 1130 | post_checkout_hook bare && |
| 1131 | git -C bare worktree add --detach ../goozy && |
| 1132 | test_cmp hook.expect goozy/hook.actual |
| 1133 | ' |
| 1134 | |
| 1135 | test_expect_success '"add" an existing but missing worktree' ' |
| 1136 | git worktree add --detach pneu && |
| 1137 | test_must_fail git worktree add --detach pneu && |
| 1138 | rm -fr pneu && |
| 1139 | test_must_fail git worktree add --detach pneu && |
| 1140 | git worktree add --force --detach pneu |
| 1141 | ' |
| 1142 | |
| 1143 | test_expect_success '"add" an existing locked but missing worktree' ' |
| 1144 | git worktree add --detach gnoo && |
| 1145 | git worktree lock gnoo && |
| 1146 | test_when_finished "git worktree unlock gnoo || :" && |
| 1147 | rm -fr gnoo && |
| 1148 | test_must_fail git worktree add --detach gnoo && |
| 1149 | test_must_fail git worktree add --force --detach gnoo && |
| 1150 | git worktree add --force --force --detach gnoo |
| 1151 | ' |
| 1152 | |
| 1153 | test_expect_success '"add" not tripped up by magic worktree matching"' ' |
| 1154 | # if worktree "sub1/bar" exists, "git worktree add bar" in distinct |
| 1155 | # directory `sub2` should not mistakenly complain that `bar` is an |
| 1156 | # already-registered worktree |
| 1157 | mkdir sub1 sub2 && |
| 1158 | git -C sub1 --git-dir=../.git worktree add --detach bozo && |
| 1159 | git -C sub2 --git-dir=../.git worktree add --detach bozo |
| 1160 | ' |
| 1161 | |
| 1162 | test_expect_success FUNNYNAMES 'sanitize generated worktree name' ' |
| 1163 | git worktree add --detach ". weird*..?.lock.lock" && |
| 1164 | test_path_is_dir .git/worktrees/---weird-.- |
| 1165 | ' |
| 1166 | |
| 1167 | test_expect_success '"add" should not fail because of another bad worktree' ' |
| 1168 | git init add-fail && |
| 1169 | ( |
| 1170 | cd add-fail && |
| 1171 | test_commit first && |
| 1172 | mkdir sub && |
| 1173 | git worktree add sub/to-be-deleted && |
| 1174 | rm -rf sub && |
| 1175 | git worktree add second |
| 1176 | ) |
| 1177 | ' |
| 1178 | |
| 1179 | test_expect_success '"add" with uninitialized submodule, with submodule.recurse unset' ' |
| 1180 | test_config_global protocol.file.allow always && |
| 1181 | test_create_repo submodule && |
| 1182 | test_commit -C submodule first && |
| 1183 | test_create_repo project && |
| 1184 | git -C project submodule add ../submodule && |
| 1185 | git -C project add submodule && |
| 1186 | test_tick && |
| 1187 | git -C project commit -m add_sub && |
| 1188 | git clone project project-clone && |
| 1189 | git -C project-clone worktree add ../project-2 |
| 1190 | ' |
| 1191 | test_expect_success '"add" with uninitialized submodule, with submodule.recurse set' ' |
| 1192 | git -C project-clone -c submodule.recurse worktree add ../project-3 |
| 1193 | ' |
| 1194 | |
| 1195 | test_expect_success '"add" with initialized submodule, with submodule.recurse unset' ' |
| 1196 | test_config_global protocol.file.allow always && |
| 1197 | git -C project-clone submodule update --init && |
| 1198 | git -C project-clone worktree add ../project-4 |
| 1199 | ' |
| 1200 | |
| 1201 | test_expect_success '"add" with initialized submodule, with submodule.recurse set' ' |
| 1202 | git -C project-clone -c submodule.recurse worktree add ../project-5 |
| 1203 | ' |
| 1204 | |
| 1205 | test_expect_success 'can create worktrees with relative paths' ' |
| 1206 | test_when_finished "git worktree remove relative" && |
| 1207 | test_config worktree.useRelativePaths false && |
| 1208 | git worktree add --relative-paths ./relative && |
| 1209 | echo "gitdir: ../.git/worktrees/relative" >expect && |
| 1210 | test_cmp expect relative/.git && |
| 1211 | echo "../../../relative/.git" >expect && |
| 1212 | test_cmp expect .git/worktrees/relative/gitdir |
| 1213 | ' |
| 1214 | |
| 1215 | test_expect_success 'can create worktrees with absolute paths' ' |
| 1216 | test_config worktree.useRelativePaths true && |
| 1217 | git worktree add ./relative && |
| 1218 | echo "gitdir: ../.git/worktrees/relative" >expect && |
| 1219 | test_cmp expect relative/.git && |
| 1220 | git worktree add --no-relative-paths ./absolute && |
| 1221 | echo "gitdir: $(pwd)/.git/worktrees/absolute" >expect && |
| 1222 | test_cmp expect absolute/.git && |
| 1223 | echo "$(pwd)/absolute/.git" >expect && |
| 1224 | test_cmp expect .git/worktrees/absolute/gitdir |
| 1225 | ' |
| 1226 | |
| 1227 | test_expect_success 'move repo without breaking relative internal links' ' |
| 1228 | test_when_finished rm -rf repo moved && |
| 1229 | git init repo && |
| 1230 | ( |
| 1231 | cd repo && |
| 1232 | test_commit initial && |
| 1233 | git worktree add --relative-paths wt1 && |
| 1234 | cd .. && |
| 1235 | mv repo moved && |
| 1236 | cd moved/wt1 && |
| 1237 | git worktree list >out 2>err && |
| 1238 | test_must_be_empty err |
| 1239 | ) |
| 1240 | ' |
| 1241 | |
| 1242 | test_expect_success 'relative worktree sets extension config' ' |
| 1243 | test_when_finished "rm -rf repo" && |
| 1244 | git init repo && |
| 1245 | git -C repo commit --allow-empty -m base && |
| 1246 | git -C repo worktree add --relative-paths ./foo && |
| 1247 | test_cmp_config -C repo 1 core.repositoryformatversion && |
| 1248 | test_cmp_config -C repo true extensions.relativeworktrees |
| 1249 | ' |
| 1250 | |
| 1251 | test_done |