t/t1092-sparse-checkout-compatibility.sh

   1 #!/bin/sh
   2
   3 test_description='compare full workdir to sparse workdir'
   4
   5 GIT_TEST_SPLIT_INDEX=0
   6 GIT_TEST_SPARSE_INDEX=
   7
   8 . ./test-lib.sh
   9
  10 test_expect_success 'setup' '
  11         git init initial-repo &&
  12         (
  13                 GIT_TEST_SPARSE_INDEX=0 &&
  14                 cd initial-repo &&
  15                 echo a >a &&
  16                 echo "after deep" >e &&
  17                 echo "after folder1" >g &&
  18                 echo "after x" >z &&
  19                 mkdir folder1 folder2 deep x &&
  20                 mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
  21                 mkdir deep/deeper1/deepest &&
  22                 mkdir deep/deeper1/deepest2 &&
  23                 mkdir deep/deeper1/deepest3 &&
  24                 echo "after deeper1" >deep/e &&
  25                 echo "after deepest" >deep/deeper1/e &&
  26                 cp a folder1 &&
  27                 cp a folder2 &&
  28                 cp a x &&
  29                 cp a deep &&
  30                 cp a deep/before &&
  31                 cp a deep/deeper1 &&
  32                 cp a deep/deeper2 &&
  33                 cp a deep/later &&
  34                 cp a deep/deeper1/deepest &&
  35                 cp a deep/deeper1/deepest2 &&
  36                 cp a deep/deeper1/deepest3 &&
  37                 cp -r deep/deeper1/ deep/deeper2 &&
  38                 mkdir deep/deeper1/0 &&
  39                 mkdir deep/deeper1/0/0 &&
  40                 touch deep/deeper1/0/1 &&
  41                 touch deep/deeper1/0/0/0 &&
  42                 >folder1- &&
  43                 >folder1.x &&
  44                 >folder10 &&
  45                 cp -r deep/deeper1/0 folder1 &&
  46                 cp -r deep/deeper1/0 folder2 &&
  47                 echo >>folder1/0/0/0 &&
  48                 echo >>folder2/0/1 &&
  49                 git add . &&
  50                 git commit -m "initial commit" &&
  51                 git checkout -b base &&
  52                 for dir in folder1 folder2 deep
  53                 do
  54                         git checkout -b update-$dir base &&
  55                         echo "updated $dir" >$dir/a &&
  56                         git commit -a -m "update $dir" || return 1
  57                 done &&
  58
  59                 git checkout -b rename-base base &&
  60                 cat >folder1/larger-content <<-\EOF &&
  61                 matching
  62                 lines
  63                 help
  64                 inexact
  65                 renames
  66                 EOF
  67                 cp folder1/larger-content folder2/ &&
  68                 cp folder1/larger-content deep/deeper1/ &&
  69                 git add . &&
  70                 git commit -m "add interesting rename content" &&
  71
  72                 git checkout -b rename-out-to-out rename-base &&
  73                 mv folder1/a folder2/b &&
  74                 mv folder1/larger-content folder2/edited-content &&
  75                 echo >>folder2/edited-content &&
  76                 echo >>folder2/0/1 &&
  77                 echo stuff >>deep/deeper1/a &&
  78                 git add . &&
  79                 git commit -m "rename folder1/... to folder2/..." &&
  80
  81                 git checkout -b rename-out-to-in rename-base &&
  82                 mv folder1/a deep/deeper1/b &&
  83                 echo more stuff >>deep/deeper1/a &&
  84                 rm folder2/0/1 &&
  85                 mkdir folder2/0/1 &&
  86                 echo >>folder2/0/1/1 &&
  87                 mv folder1/larger-content deep/deeper1/edited-content &&
  88                 echo >>deep/deeper1/edited-content &&
  89                 git add . &&
  90                 git commit -m "rename folder1/... to deep/deeper1/..." &&
  91
  92                 git checkout -b rename-in-to-out rename-base &&
  93                 mv deep/deeper1/a folder1/b &&
  94                 echo >>folder2/0/1 &&
  95                 rm -rf folder1/0/0 &&
  96                 echo >>folder1/0/0 &&
  97                 mv deep/deeper1/larger-content folder1/edited-content &&
  98                 echo >>folder1/edited-content &&
  99                 git add . &&
 100                 git commit -m "rename deep/deeper1/... to folder1/..." &&
 101
 102                 git checkout -b df-conflict-1 base &&
 103                 rm -rf folder1 &&
 104                 echo content >folder1 &&
 105                 git add . &&
 106                 git commit -m "dir to file" &&
 107
 108                 git checkout -b df-conflict-2 base &&
 109                 rm -rf folder2 &&
 110                 echo content >folder2 &&
 111                 git add . &&
 112                 git commit -m "dir to file" &&
 113
 114                 git checkout -b fd-conflict base &&
 115                 rm a &&
 116                 mkdir a &&
 117                 echo content >a/a &&
 118                 git add . &&
 119                 git commit -m "file to dir" &&
 120
 121                 for side in left right
 122                 do
 123                         git checkout -b merge-$side base &&
 124                         echo $side >>deep/deeper2/a &&
 125                         echo $side >>folder1/a &&
 126                         echo $side >>folder2/a &&
 127                         git add . &&
 128                         git commit -m "$side" || return 1
 129                 done &&
 130
 131                 git checkout -b deepest base &&
 132                 echo "updated deepest" >deep/deeper1/deepest/a &&
 133                 echo "updated deepest2" >deep/deeper1/deepest2/a &&
 134                 echo "updated deepest3" >deep/deeper1/deepest3/a &&
 135                 git commit -a -m "update deepest" &&
 136
 137                 git checkout -f base &&
 138                 git reset --hard
 139         )
 140 '
 141
 142 init_repos () {
 143         rm -rf full-checkout sparse-checkout sparse-index &&
 144
 145         # create repos in initial state
 146         cp -r initial-repo full-checkout &&
 147         git -C full-checkout reset --hard &&
 148
 149         cp -r initial-repo sparse-checkout &&
 150         git -C sparse-checkout reset --hard &&
 151
 152         cp -r initial-repo sparse-index &&
 153         git -C sparse-index reset --hard &&
 154
 155         # initialize sparse-checkout definitions
 156         git -C sparse-checkout sparse-checkout init --cone &&
 157         git -C sparse-checkout sparse-checkout set deep &&
 158         git -C sparse-index sparse-checkout init --cone --sparse-index &&
 159         test_cmp_config -C sparse-index true index.sparse &&
 160         git -C sparse-index sparse-checkout set deep
 161 }
 162
 163 run_on_sparse () {
 164         (
 165                 cd sparse-checkout &&
 166                 GIT_PROGRESS_DELAY=100000 "$@" >../sparse-checkout-out 2>../sparse-checkout-err
 167         ) &&
 168         (
 169                 cd sparse-index &&
 170                 GIT_PROGRESS_DELAY=100000 "$@" >../sparse-index-out 2>../sparse-index-err
 171         )
 172 }
 173
 174 run_on_all () {
 175         (
 176                 cd full-checkout &&
 177                 GIT_PROGRESS_DELAY=100000 "$@" >../full-checkout-out 2>../full-checkout-err
 178         ) &&
 179         run_on_sparse "$@"
 180 }
 181
 182 test_all_match () {
 183         run_on_all "$@" &&
 184         test_cmp full-checkout-out sparse-checkout-out &&
 185         test_cmp full-checkout-out sparse-index-out &&
 186         test_cmp full-checkout-err sparse-checkout-err &&
 187         test_cmp full-checkout-err sparse-index-err
 188 }
 189
 190 test_sparse_match () {
 191         run_on_sparse "$@" &&
 192         test_cmp sparse-checkout-out sparse-index-out &&
 193         test_cmp sparse-checkout-err sparse-index-err
 194 }
 195
 196 test_sparse_unstaged () {
 197         file=$1 &&
 198         for repo in sparse-checkout sparse-index
 199         do
 200                 # Skip "unmerged" paths
 201                 git -C $repo diff --staged --diff-filter=u -- "$file" >diff &&
 202                 test_must_be_empty diff || return 1
 203         done
 204 }
 205
 206 test_expect_success 'sparse-index contents' '
 207         init_repos &&
 208
 209         test-tool -C sparse-index read-cache --table >cache &&
 210         for dir in folder1 folder2 x
 211         do
 212                 TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
 213                 grep "040000 tree $TREE $dir/" cache \
 214                         || return 1
 215         done &&
 216
 217         git -C sparse-index sparse-checkout set folder1 &&
 218
 219         test-tool -C sparse-index read-cache --table >cache &&
 220         for dir in deep folder2 x
 221         do
 222                 TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
 223                 grep "040000 tree $TREE $dir/" cache \
 224                         || return 1
 225         done &&
 226
 227         git -C sparse-index sparse-checkout set deep/deeper1 &&
 228
 229         test-tool -C sparse-index read-cache --table >cache &&
 230         for dir in deep/deeper2 folder1 folder2 x
 231         do
 232                 TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
 233                 grep "040000 tree $TREE $dir/" cache \
 234                         || return 1
 235         done &&
 236
 237         # Disabling the sparse-index removes tree entries with full ones
 238         git -C sparse-index sparse-checkout init --no-sparse-index &&
 239
 240         test-tool -C sparse-index read-cache --table >cache &&
 241         ! grep "040000 tree" cache &&
 242         test_sparse_match test-tool read-cache --table
 243 '
 244
 245 test_expect_success 'expanded in-memory index matches full index' '
 246         init_repos &&
 247         test_sparse_match test-tool read-cache --expand --table
 248 '
 249
 250 test_expect_success 'status with options' '
 251         init_repos &&
 252         test_sparse_match ls &&
 253         test_all_match git status --porcelain=v2 &&
 254         test_all_match git status --porcelain=v2 -z -u &&
 255         test_all_match git status --porcelain=v2 -uno &&
 256         run_on_all touch README.md &&
 257         test_all_match git status --porcelain=v2 &&
 258         test_all_match git status --porcelain=v2 -z -u &&
 259         test_all_match git status --porcelain=v2 -uno &&
 260         test_all_match git add README.md &&
 261         test_all_match git status --porcelain=v2 &&
 262         test_all_match git status --porcelain=v2 -z -u &&
 263         test_all_match git status --porcelain=v2 -uno
 264 '
 265
 266 test_expect_success 'status reports sparse-checkout' '
 267         init_repos &&
 268         git -C sparse-checkout status >full &&
 269         git -C sparse-index status >sparse &&
 270         test_i18ngrep "You are in a sparse checkout with " full &&
 271         test_i18ngrep "You are in a sparse checkout." sparse
 272 '
 273
 274 test_expect_success 'add, commit, checkout' '
 275         init_repos &&
 276
 277         write_script edit-contents <<-\EOF &&
 278         echo text >>$1
 279         EOF
 280         run_on_all ../edit-contents README.md &&
 281
 282         test_all_match git add README.md &&
 283         test_all_match git status --porcelain=v2 &&
 284         test_all_match git commit -m "Add README.md" &&
 285
 286         test_all_match git checkout HEAD~1 &&
 287         test_all_match git checkout - &&
 288
 289         run_on_all ../edit-contents README.md &&
 290
 291         test_all_match git add -A &&
 292         test_all_match git status --porcelain=v2 &&
 293         test_all_match git commit -m "Extend README.md" &&
 294
 295         test_all_match git checkout HEAD~1 &&
 296         test_all_match git checkout - &&
 297
 298         run_on_all ../edit-contents deep/newfile &&
 299
 300         test_all_match git status --porcelain=v2 -uno &&
 301         test_all_match git status --porcelain=v2 &&
 302         test_all_match git add . &&
 303         test_all_match git status --porcelain=v2 &&
 304         test_all_match git commit -m "add deep/newfile" &&
 305
 306         test_all_match git checkout HEAD~1 &&
 307         test_all_match git checkout -
 308 '
 309
 310 test_expect_success 'deep changes during checkout' '
 311         init_repos &&
 312
 313         test_sparse_match git sparse-checkout set deep/deeper1/deepest &&
 314         test_all_match git checkout deepest &&
 315         test_all_match git checkout base
 316 '
 317
 318 test_expect_success 'add outside sparse cone' '
 319         init_repos &&
 320
 321         run_on_sparse mkdir folder1 &&
 322         run_on_sparse ../edit-contents folder1/a &&
 323         run_on_sparse ../edit-contents folder1/newfile &&
 324         test_sparse_match test_must_fail git add folder1/a &&
 325         grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 326         test_sparse_unstaged folder1/a &&
 327         test_sparse_match test_must_fail git add folder1/newfile &&
 328         grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 329         test_sparse_unstaged folder1/newfile
 330 '
 331
 332 test_expect_success 'commit including unstaged changes' '
 333         init_repos &&
 334
 335         write_script edit-file <<-\EOF &&
 336         echo $1 >$2
 337         EOF
 338
 339         run_on_all ../edit-file 1 a &&
 340         run_on_all ../edit-file 1 deep/a &&
 341
 342         test_all_match git commit -m "-a" -a &&
 343         test_all_match git status --porcelain=v2 &&
 344
 345         run_on_all ../edit-file 2 a &&
 346         run_on_all ../edit-file 2 deep/a &&
 347
 348         test_all_match git commit -m "--include" --include deep/a &&
 349         test_all_match git status --porcelain=v2 &&
 350         test_all_match git commit -m "--include" --include a &&
 351         test_all_match git status --porcelain=v2 &&
 352
 353         run_on_all ../edit-file 3 a &&
 354         run_on_all ../edit-file 3 deep/a &&
 355
 356         test_all_match git commit -m "--amend" -a --amend &&
 357         test_all_match git status --porcelain=v2
 358 '
 359
 360 test_expect_success 'status/add: outside sparse cone' '
 361         init_repos &&
 362
 363         # folder1 is at HEAD, but outside the sparse cone
 364         run_on_sparse mkdir folder1 &&
 365         cp initial-repo/folder1/a sparse-checkout/folder1/a &&
 366         cp initial-repo/folder1/a sparse-index/folder1/a &&
 367
 368         test_sparse_match git status &&
 369
 370         write_script edit-contents <<-\EOF &&
 371         echo text >>$1
 372         EOF
 373         run_on_sparse ../edit-contents folder1/a &&
 374         run_on_all ../edit-contents folder1/new &&
 375
 376         test_sparse_match git status --porcelain=v2 &&
 377
 378         # Adding the path outside of the sparse-checkout cone should fail.
 379         test_sparse_match test_must_fail git add folder1/a &&
 380         grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 381         test_sparse_unstaged folder1/a &&
 382         test_sparse_match test_must_fail git add --refresh folder1/a &&
 383         grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 384         test_sparse_unstaged folder1/a &&
 385         test_sparse_match test_must_fail git add folder1/new &&
 386         grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 387         test_sparse_unstaged folder1/new &&
 388         test_sparse_match git add --sparse folder1/a &&
 389         test_sparse_match git add --sparse folder1/new &&
 390
 391         test_all_match git add --sparse . &&
 392         test_all_match git status --porcelain=v2 &&
 393         test_all_match git commit -m folder1/new &&
 394         test_all_match git rev-parse HEAD^{tree} &&
 395
 396         run_on_all ../edit-contents folder1/newer &&
 397         test_all_match git add --sparse folder1/ &&
 398         test_all_match git status --porcelain=v2 &&
 399         test_all_match git commit -m folder1/newer &&
 400         test_all_match git rev-parse HEAD^{tree}
 401 '
 402
 403 test_expect_success 'checkout and reset --hard' '
 404         init_repos &&
 405
 406         test_all_match git checkout update-folder1 &&
 407         test_all_match git status --porcelain=v2 &&
 408
 409         test_all_match git checkout update-deep &&
 410         test_all_match git status --porcelain=v2 &&
 411
 412         test_all_match git checkout -b reset-test &&
 413         test_all_match git reset --hard deepest &&
 414         test_all_match git reset --hard update-folder1 &&
 415         test_all_match git reset --hard update-folder2
 416 '
 417
 418 test_expect_success 'diff --cached' '
 419         init_repos &&
 420
 421         write_script edit-contents <<-\EOF &&
 422         echo text >>README.md
 423         EOF
 424         run_on_all ../edit-contents &&
 425
 426         test_all_match git diff &&
 427         test_all_match git diff --cached &&
 428         test_all_match git add README.md &&
 429         test_all_match git diff &&
 430         test_all_match git diff --cached
 431 '
 432
 433 # NEEDSWORK: sparse-checkout behaves differently from full-checkout when
 434 # running this test with 'df-conflict-2' after 'df-conflict-1'.
 435 test_expect_success 'diff with renames and conflicts' '
 436         init_repos &&
 437
 438         for branch in rename-out-to-out \
 439                       rename-out-to-in \
 440                       rename-in-to-out \
 441                       df-conflict-1 \
 442                       fd-conflict
 443         do
 444                 test_all_match git checkout rename-base &&
 445                 test_all_match git checkout $branch -- . &&
 446                 test_all_match git status --porcelain=v2 &&
 447                 test_all_match git diff --cached --no-renames &&
 448                 test_all_match git diff --cached --find-renames || return 1
 449         done
 450 '
 451
 452 test_expect_success 'diff with directory/file conflicts' '
 453         init_repos &&
 454
 455         for branch in rename-out-to-out \
 456                       rename-out-to-in \
 457                       rename-in-to-out \
 458                       df-conflict-1 \
 459                       df-conflict-2 \
 460                       fd-conflict
 461         do
 462                 git -C full-checkout reset --hard &&
 463                 test_sparse_match git reset --hard &&
 464                 test_all_match git checkout $branch &&
 465                 test_all_match git checkout rename-base -- . &&
 466                 test_all_match git status --porcelain=v2 &&
 467                 test_all_match git diff --cached --no-renames &&
 468                 test_all_match git diff --cached --find-renames || return 1
 469         done
 470 '
 471
 472 test_expect_success 'log with pathspec outside sparse definition' '
 473         init_repos &&
 474
 475         test_all_match git log -- a &&
 476         test_all_match git log -- folder1/a &&
 477         test_all_match git log -- folder2/a &&
 478         test_all_match git log -- deep/a &&
 479         test_all_match git log -- deep/deeper1/a &&
 480         test_all_match git log -- deep/deeper1/deepest/a &&
 481
 482         test_all_match git checkout update-folder1 &&
 483         test_all_match git log -- folder1/a
 484 '
 485
 486 test_expect_success 'blame with pathspec inside sparse definition' '
 487         init_repos &&
 488
 489         for file in a \
 490                         deep/a \
 491                         deep/deeper1/a \
 492                         deep/deeper1/deepest/a
 493         do
 494                 test_all_match git blame $file
 495         done
 496 '
 497
 498 # Without a revision specified, blame will error if passed any file that
 499 # is not present in the working directory (even if the file is tracked).
 500 # Here we just verify that this is also true with sparse checkouts.
 501 test_expect_success 'blame with pathspec outside sparse definition' '
 502         init_repos &&
 503         test_sparse_match git sparse-checkout set &&
 504
 505         for file in a \
 506                         deep/a \
 507                         deep/deeper1/a \
 508                         deep/deeper1/deepest/a
 509         do
 510                 test_sparse_match test_must_fail git blame $file &&
 511                 cat >expect <<-EOF &&
 512                 fatal: Cannot lstat '"'"'$file'"'"': No such file or directory
 513                 EOF
 514                 # We compare sparse-checkout-err and sparse-index-err in
 515                 # `test_sparse_match`. Given we know they are the same, we
 516                 # only check the content of sparse-index-err here.
 517                 test_cmp expect sparse-index-err
 518         done
 519 '
 520
 521 test_expect_success 'checkout and reset (mixed)' '
 522         init_repos &&
 523
 524         test_all_match git checkout -b reset-test update-deep &&
 525         test_all_match git reset deepest &&
 526
 527         # Because skip-worktree is preserved, resetting to update-folder1
 528         # will show worktree changes for folder1/a in full-checkout, but not
 529         # in sparse-checkout or sparse-index.
 530         git -C full-checkout reset update-folder1 >full-checkout-out &&
 531         test_sparse_match git reset update-folder1 &&
 532         grep "M folder1/a" full-checkout-out &&
 533         ! grep "M       folder1/a" sparse-checkout-out &&
 534         run_on_sparse test_path_is_missing folder1
 535 '
 536
 537 test_expect_success 'checkout and reset (merge)' '
 538         init_repos &&
 539
 540         write_script edit-contents <<-\EOF &&
 541         echo text >>$1
 542         EOF
 543
 544         test_all_match git checkout -b reset-test update-deep &&
 545         run_on_all ../edit-contents a &&
 546         test_all_match git reset --merge deepest &&
 547         test_all_match git status --porcelain=v2 &&
 548
 549         test_all_match git reset --hard update-deep &&
 550         run_on_all ../edit-contents deep/a &&
 551         test_all_match test_must_fail git reset --merge deepest
 552 '
 553
 554 test_expect_success 'checkout and reset (keep)' '
 555         init_repos &&
 556
 557         write_script edit-contents <<-\EOF &&
 558         echo text >>$1
 559         EOF
 560
 561         test_all_match git checkout -b reset-test update-deep &&
 562         run_on_all ../edit-contents a &&
 563         test_all_match git reset --keep deepest &&
 564         test_all_match git status --porcelain=v2 &&
 565
 566         test_all_match git reset --hard update-deep &&
 567         run_on_all ../edit-contents deep/a &&
 568         test_all_match test_must_fail git reset --keep deepest
 569 '
 570
 571 test_expect_success 'reset with pathspecs inside sparse definition' '
 572         init_repos &&
 573
 574         write_script edit-contents <<-\EOF &&
 575         echo text >>$1
 576         EOF
 577
 578         test_all_match git checkout -b reset-test update-deep &&
 579         run_on_all ../edit-contents deep/a &&
 580
 581         test_all_match git reset base -- deep/a &&
 582         test_all_match git status --porcelain=v2 &&
 583
 584         test_all_match git reset base -- nonexistent-file &&
 585         test_all_match git status --porcelain=v2 &&
 586
 587         test_all_match git reset deepest -- deep &&
 588         test_all_match git status --porcelain=v2
 589 '
 590
 591 # Although the working tree differs between full and sparse checkouts after
 592 # reset, the state of the index is the same.
 593 test_expect_success 'reset with pathspecs outside sparse definition' '
 594         init_repos &&
 595         test_all_match git checkout -b reset-test base &&
 596
 597         test_sparse_match git reset update-folder1 -- folder1 &&
 598         git -C full-checkout reset update-folder1 -- folder1 &&
 599         test_sparse_match git status --porcelain=v2 &&
 600         test_all_match git rev-parse HEAD:folder1 &&
 601
 602         test_sparse_match git reset update-folder2 -- folder2/a &&
 603         git -C full-checkout reset update-folder2 -- folder2/a &&
 604         test_sparse_match git status --porcelain=v2 &&
 605         test_all_match git rev-parse HEAD:folder2/a
 606 '
 607
 608 test_expect_success 'reset with wildcard pathspec' '
 609         init_repos &&
 610
 611         test_all_match git reset update-deep -- deep\* &&
 612         test_all_match git ls-files -s -- deep &&
 613
 614         test_all_match git reset deepest -- deep\*\*\* &&
 615         test_all_match git ls-files -s -- deep &&
 616
 617         # The following `git reset`s result in updating the index on files with
 618         # `skip-worktree` enabled. To avoid failing due to discrepencies in reported
 619         # "modified" files, `test_sparse_match` reset is performed separately from
 620         # "full-checkout" reset, then the index contents of all repos are verified.
 621
 622         test_sparse_match git reset update-folder1 -- \*/a &&
 623         git -C full-checkout reset update-folder1 -- \*/a &&
 624         test_all_match git ls-files -s -- deep/a folder1/a &&
 625
 626         test_sparse_match git reset update-folder2 -- folder\* &&
 627         git -C full-checkout reset update-folder2 -- folder\* &&
 628         test_all_match git ls-files -s -- folder10 folder1 folder2 &&
 629
 630         test_sparse_match git reset base -- folder1/\* &&
 631         git -C full-checkout reset base -- folder1/\* &&
 632         test_all_match git ls-files -s -- folder1
 633 '
 634
 635 test_expect_success 'merge, cherry-pick, and rebase' '
 636         init_repos &&
 637
 638         for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
 639         do
 640                 test_all_match git checkout -B temp update-deep &&
 641                 test_all_match git $OPERATION update-folder1 &&
 642                 test_all_match git rev-parse HEAD^{tree} &&
 643                 test_all_match git $OPERATION update-folder2 &&
 644                 test_all_match git rev-parse HEAD^{tree} || return 1
 645         done
 646 '
 647
 648 test_expect_success 'merge with conflict outside cone' '
 649         init_repos &&
 650
 651         test_all_match git checkout -b merge-tip merge-left &&
 652         test_all_match git status --porcelain=v2 &&
 653         test_all_match test_must_fail git merge -m merge merge-right &&
 654         test_all_match git status --porcelain=v2 &&
 655
 656         # Resolve the conflict in different ways:
 657         # 1. Revert to the base
 658         test_all_match git checkout base -- deep/deeper2/a &&
 659         test_all_match git status --porcelain=v2 &&
 660
 661         # 2. Add the file with conflict markers
 662         test_sparse_match test_must_fail git add folder1/a &&
 663         grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 664         test_sparse_unstaged folder1/a &&
 665         test_all_match git add --sparse folder1/a &&
 666         test_all_match git status --porcelain=v2 &&
 667
 668         # 3. Rename the file to another sparse filename and
 669         #    accept conflict markers as resolved content.
 670         run_on_all mv folder2/a folder2/z &&
 671         test_sparse_match test_must_fail git add folder2 &&
 672         grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 673         test_sparse_unstaged folder2/z &&
 674         test_all_match git add --sparse folder2 &&
 675         test_all_match git status --porcelain=v2 &&
 676
 677         test_all_match git merge --continue &&
 678         test_all_match git status --porcelain=v2 &&
 679         test_all_match git rev-parse HEAD^{tree}
 680 '
 681
 682 test_expect_success 'cherry-pick/rebase with conflict outside cone' '
 683         init_repos &&
 684
 685         for OPERATION in cherry-pick rebase
 686         do
 687                 test_all_match git checkout -B tip &&
 688                 test_all_match git reset --hard merge-left &&
 689                 test_all_match git status --porcelain=v2 &&
 690                 test_all_match test_must_fail git $OPERATION merge-right &&
 691                 test_all_match git status --porcelain=v2 &&
 692
 693                 # Resolve the conflict in different ways:
 694                 # 1. Revert to the base
 695                 test_all_match git checkout base -- deep/deeper2/a &&
 696                 test_all_match git status --porcelain=v2 &&
 697
 698                 # 2. Add the file with conflict markers
 699                 # NEEDSWORK: Even though the merge conflict removed the
 700                 # SKIP_WORKTREE bit from the index entry for folder1/a, we should
 701                 # warn that this is a problematic add.
 702                 test_sparse_match test_must_fail git add folder1/a &&
 703                 grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 704                 test_sparse_unstaged folder1/a &&
 705                 test_all_match git add --sparse folder1/a &&
 706                 test_all_match git status --porcelain=v2 &&
 707
 708                 # 3. Rename the file to another sparse filename and
 709                 #    accept conflict markers as resolved content.
 710                 # NEEDSWORK: This mode now fails, because folder2/z is
 711                 # outside of the sparse-checkout cone and does not match an
 712                 # existing index entry with the SKIP_WORKTREE bit cleared.
 713                 run_on_all mv folder2/a folder2/z &&
 714                 test_sparse_match test_must_fail git add folder2 &&
 715                 grep "Disable or modify the sparsity rules" sparse-checkout-err &&
 716                 test_sparse_unstaged folder2/z &&
 717                 test_all_match git add --sparse folder2 &&
 718                 test_all_match git status --porcelain=v2 &&
 719
 720                 test_all_match git $OPERATION --continue &&
 721                 test_all_match git status --porcelain=v2 &&
 722                 test_all_match git rev-parse HEAD^{tree} || return 1
 723         done
 724 '
 725
 726 test_expect_success 'merge with outside renames' '
 727         init_repos &&
 728
 729         for type in out-to-out out-to-in in-to-out
 730         do
 731                 test_all_match git reset --hard &&
 732                 test_all_match git checkout -f -b merge-$type update-deep &&
 733                 test_all_match git merge -m "$type" rename-$type &&
 734                 test_all_match git rev-parse HEAD^{tree} || return 1
 735         done
 736 '
 737
 738 # Sparse-index fails to convert the index in the
 739 # final 'git cherry-pick' command.
 740 test_expect_success 'cherry-pick with conflicts' '
 741         init_repos &&
 742
 743         write_script edit-conflict <<-\EOF &&
 744         echo $1 >conflict
 745         EOF
 746
 747         test_all_match git checkout -b to-cherry-pick &&
 748         run_on_all ../edit-conflict ABC &&
 749         test_all_match git add conflict &&
 750         test_all_match git commit -m "conflict to pick" &&
 751
 752         test_all_match git checkout -B base HEAD~1 &&
 753         run_on_all ../edit-conflict DEF &&
 754         test_all_match git add conflict &&
 755         test_all_match git commit -m "conflict in base" &&
 756
 757         test_all_match test_must_fail git cherry-pick to-cherry-pick
 758 '
 759
 760 test_expect_success 'clean' '
 761         init_repos &&
 762
 763         echo bogus >>.gitignore &&
 764         run_on_all cp ../.gitignore . &&
 765         test_all_match git add .gitignore &&
 766         test_all_match git commit -m "ignore bogus files" &&
 767
 768         run_on_sparse mkdir folder1 &&
 769         run_on_all touch folder1/bogus &&
 770
 771         test_all_match git status --porcelain=v2 &&
 772         test_all_match git clean -f &&
 773         test_all_match git status --porcelain=v2 &&
 774         test_sparse_match ls &&
 775         test_sparse_match ls folder1 &&
 776
 777         test_all_match git clean -xf &&
 778         test_all_match git status --porcelain=v2 &&
 779         test_sparse_match ls &&
 780         test_sparse_match ls folder1 &&
 781
 782         test_all_match git clean -xdf &&
 783         test_all_match git status --porcelain=v2 &&
 784         test_sparse_match ls &&
 785         test_sparse_match ls folder1 &&
 786
 787         test_sparse_match test_path_is_dir folder1
 788 '
 789
 790 test_expect_success 'submodule handling' '
 791         init_repos &&
 792
 793         test_sparse_match git sparse-checkout add modules &&
 794         test_all_match mkdir modules &&
 795         test_all_match touch modules/a &&
 796         test_all_match git add modules &&
 797         test_all_match git commit -m "add modules directory" &&
 798
 799         run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
 800         test_all_match git commit -m "add submodule" &&
 801
 802         # having a submodule prevents "modules" from collapse
 803         test_sparse_match git sparse-checkout set deep/deeper1 &&
 804         test-tool -C sparse-index read-cache --table >cache &&
 805         grep "100644 blob .*    modules/a" cache &&
 806         grep "160000 commit $(git -C initial-repo rev-parse HEAD)       modules/sub" cache
 807 '
 808
 809 # When working with a sparse index, some commands will need to expand the
 810 # index to operate properly. If those commands also write the index back
 811 # to disk, they need to convert the index to sparse before writing.
 812 # This test verifies that both of these events are logged in trace2 logs.
 813 test_expect_success 'sparse-index is expanded and converted back' '
 814         init_repos &&
 815
 816         GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
 817                 git -C sparse-index reset -- folder1/a &&
 818         test_region index convert_to_sparse trace2.txt &&
 819         test_region index ensure_full_index trace2.txt
 820 '
 821
 822 test_expect_success 'index.sparse disabled inline uses full index' '
 823         init_repos &&
 824
 825         # When index.sparse is disabled inline with `git status`, the
 826         # index is expanded at the beginning of the execution then never
 827         # converted back to sparse. It is then written to disk as a full index.
 828         rm -f trace2.txt &&
 829         GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
 830                 git -C sparse-index -c index.sparse=false status &&
 831         ! test_region index convert_to_sparse trace2.txt &&
 832         test_region index ensure_full_index trace2.txt &&
 833
 834         # Since index.sparse is set to true at a repo level, the index
 835         # is converted from full to sparse when read, then never expanded
 836         # over the course of `git status`. It is written to disk as a sparse
 837         # index.
 838         rm -f trace2.txt &&
 839         GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
 840                 git -C sparse-index status &&
 841         test_region index convert_to_sparse trace2.txt &&
 842         ! test_region index ensure_full_index trace2.txt &&
 843
 844         # Now that the index has been written to disk as sparse, it is not
 845         # converted to sparse (or expanded to full) when read by `git status`.
 846         rm -f trace2.txt &&
 847         GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
 848                 git -C sparse-index status &&
 849         ! test_region index convert_to_sparse trace2.txt &&
 850         ! test_region index ensure_full_index trace2.txt
 851 '
 852
 853 ensure_not_expanded () {
 854         rm -f trace2.txt &&
 855         echo >>sparse-index/untracked.txt &&
 856
 857         if test "$1" = "!"
 858         then
 859                 shift &&
 860                 test_must_fail env \
 861                         GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
 862                         git -C sparse-index "$@" || return 1
 863         else
 864                 GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
 865                         git -C sparse-index "$@" || return 1
 866         fi &&
 867         test_region ! index ensure_full_index trace2.txt
 868 }
 869
 870 test_expect_success 'sparse-index is not expanded' '
 871         init_repos &&
 872
 873         ensure_not_expanded status &&
 874         ensure_not_expanded commit --allow-empty -m empty &&
 875         echo >>sparse-index/a &&
 876         ensure_not_expanded commit -a -m a &&
 877         echo >>sparse-index/a &&
 878         ensure_not_expanded commit --include a -m a &&
 879         echo >>sparse-index/deep/deeper1/a &&
 880         ensure_not_expanded commit --include deep/deeper1/a -m deeper &&
 881         ensure_not_expanded checkout rename-out-to-out &&
 882         ensure_not_expanded checkout - &&
 883         ensure_not_expanded switch rename-out-to-out &&
 884         ensure_not_expanded switch - &&
 885         ensure_not_expanded reset --hard &&
 886         ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
 887         ensure_not_expanded reset --hard &&
 888         ensure_not_expanded restore -s rename-out-to-out -- deep/deeper1 &&
 889
 890         echo >>sparse-index/README.md &&
 891         ensure_not_expanded add -A &&
 892         echo >>sparse-index/extra.txt &&
 893         ensure_not_expanded add extra.txt &&
 894         echo >>sparse-index/untracked.txt &&
 895         ensure_not_expanded add . &&
 896
 897         for ref in update-deep update-folder1 update-folder2 update-deep
 898         do
 899                 echo >>sparse-index/README.md &&
 900                 ensure_not_expanded reset --hard $ref || return 1
 901         done &&
 902
 903         ensure_not_expanded reset --mixed base &&
 904         ensure_not_expanded reset --hard update-deep &&
 905         ensure_not_expanded reset --keep base &&
 906         ensure_not_expanded reset --merge update-deep &&
 907         ensure_not_expanded reset --hard &&
 908
 909         ensure_not_expanded reset base -- deep/a &&
 910         ensure_not_expanded reset base -- nonexistent-file &&
 911         ensure_not_expanded reset deepest -- deep &&
 912
 913         # Although folder1 is outside the sparse definition, it exists as a
 914         # directory entry in the index, so the pathspec will not force the
 915         # index to be expanded.
 916         ensure_not_expanded reset deepest -- folder1 &&
 917         ensure_not_expanded reset deepest -- folder1/ &&
 918
 919         # Wildcard identifies only in-cone files, no index expansion
 920         ensure_not_expanded reset deepest -- deep/\* &&
 921
 922         # Wildcard identifies only full sparse directories, no index expansion
 923         ensure_not_expanded reset deepest -- folder\* &&
 924
 925         ensure_not_expanded checkout -f update-deep &&
 926         test_config -C sparse-index pull.twohead ort &&
 927         (
 928                 sane_unset GIT_TEST_MERGE_ALGORITHM &&
 929                 for OPERATION in "merge -m merge" cherry-pick rebase
 930                 do
 931                         ensure_not_expanded merge -m merge update-folder1 &&
 932                         ensure_not_expanded merge -m merge update-folder2 || return 1
 933                 done
 934         )
 935 '
 936
 937 test_expect_success 'sparse-index is not expanded: merge conflict in cone' '
 938         init_repos &&
 939
 940         for side in right left
 941         do
 942                 git -C sparse-index checkout -b expand-$side base &&
 943                 echo $side >sparse-index/deep/a &&
 944                 git -C sparse-index commit -a -m "$side" || return 1
 945         done &&
 946
 947         (
 948                 sane_unset GIT_TEST_MERGE_ALGORITHM &&
 949                 git -C sparse-index config pull.twohead ort &&
 950                 ensure_not_expanded ! merge -m merged expand-right
 951         )
 952 '
 953
 954 test_expect_success 'sparse index is not expanded: diff' '
 955         init_repos &&
 956
 957         write_script edit-contents <<-\EOF &&
 958         echo text >>$1
 959         EOF
 960
 961         # Add file within cone
 962         test_sparse_match git sparse-checkout set deep &&
 963         run_on_all ../edit-contents deep/testfile &&
 964         test_all_match git add deep/testfile &&
 965         run_on_all ../edit-contents deep/testfile &&
 966
 967         test_all_match git diff &&
 968         test_all_match git diff --cached &&
 969         ensure_not_expanded diff &&
 970         ensure_not_expanded diff --cached &&
 971
 972         # Add file outside cone
 973         test_all_match git reset --hard &&
 974         run_on_all mkdir newdirectory &&
 975         run_on_all ../edit-contents newdirectory/testfile &&
 976         test_sparse_match git sparse-checkout set newdirectory &&
 977         test_all_match git add newdirectory/testfile &&
 978         run_on_all ../edit-contents newdirectory/testfile &&
 979         test_sparse_match git sparse-checkout set &&
 980
 981         test_all_match git diff &&
 982         test_all_match git diff --cached &&
 983         ensure_not_expanded diff &&
 984         ensure_not_expanded diff --cached &&
 985
 986         # Merge conflict outside cone
 987         # The sparse checkout will report a warning that is not in the
 988         # full checkout, so we use `run_on_all` instead of
 989         # `test_all_match`
 990         run_on_all git reset --hard &&
 991         test_all_match git checkout merge-left &&
 992         test_all_match test_must_fail git merge merge-right &&
 993
 994         test_all_match git diff &&
 995         test_all_match git diff --cached &&
 996         ensure_not_expanded diff &&
 997         ensure_not_expanded diff --cached
 998 '
 999
1000 test_expect_success 'sparse index is not expanded: blame' '
1001         init_repos &&
1002
1003         for file in a \
1004                         deep/a \
1005                         deep/deeper1/a \
1006                         deep/deeper1/deepest/a
1007         do
1008                 ensure_not_expanded blame $file
1009         done
1010 '
1011
1012 # NEEDSWORK: a sparse-checkout behaves differently from a full checkout
1013 # in this scenario, but it shouldn't.
1014 test_expect_success 'reset mixed and checkout orphan' '
1015         init_repos &&
1016
1017         test_all_match git checkout rename-out-to-in &&
1018
1019         # Sparse checkouts do not agree with full checkouts about
1020         # how to report a directory/file conflict during a reset.
1021         # This command would fail with test_all_match because the
1022         # full checkout reports "T folder1/0/1" while a sparse
1023         # checkout reports "D folder1/0/1". This matches because
1024         # the sparse checkouts skip "adding" the other side of
1025         # the conflict.
1026         test_sparse_match git reset --mixed HEAD~1 &&
1027         test_sparse_match test-tool read-cache --table --expand &&
1028         test_sparse_match git status --porcelain=v2 &&
1029
1030         # At this point, sparse-checkouts behave differently
1031         # from the full-checkout.
1032         test_sparse_match git checkout --orphan new-branch &&
1033         test_sparse_match test-tool read-cache --table --expand &&
1034         test_sparse_match git status --porcelain=v2
1035 '
1036
1037 test_expect_success 'add everything with deep new file' '
1038         init_repos &&
1039
1040         run_on_sparse git sparse-checkout set deep/deeper1/deepest &&
1041
1042         run_on_all touch deep/deeper1/x &&
1043         test_all_match git add . &&
1044         test_all_match git status --porcelain=v2
1045 '
1046
1047 # NEEDSWORK: 'git checkout' behaves incorrectly in the case of
1048 # directory/file conflicts, even without sparse-checkout. Use this
1049 # test only as a documentation of the incorrect behavior, not a
1050 # measure of how it _should_ behave.
1051 test_expect_success 'checkout behaves oddly with df-conflict-1' '
1052         init_repos &&
1053
1054         test_sparse_match git sparse-checkout disable &&
1055
1056         write_script edit-content <<-\EOF &&
1057         echo content >>folder1/larger-content
1058         git add folder1
1059         EOF
1060
1061         run_on_all ../edit-content &&
1062         test_all_match git status --porcelain=v2 &&
1063
1064         git -C sparse-checkout sparse-checkout init --cone &&
1065         git -C sparse-index sparse-checkout init --cone --sparse-index &&
1066
1067         test_all_match git status --porcelain=v2 &&
1068
1069         # This checkout command should fail, because we have a staged
1070         # change to folder1/larger-content, but the destination changes
1071         # folder1 to a file.
1072         git -C full-checkout checkout df-conflict-1 \
1073                 1>full-checkout-out \
1074                 2>full-checkout-err &&
1075         git -C sparse-checkout checkout df-conflict-1 \
1076                 1>sparse-checkout-out \
1077                 2>sparse-checkout-err &&
1078         git -C sparse-index checkout df-conflict-1 \
1079                 1>sparse-index-out \
1080                 2>sparse-index-err &&
1081
1082         # Instead, the checkout deletes the folder1 file and adds the
1083         # folder1/larger-content file, leaving all other paths that were
1084         # in folder1/ as deleted (without any warning).
1085         cat >expect <<-EOF &&
1086         D       folder1
1087         A       folder1/larger-content
1088         EOF
1089         test_cmp expect full-checkout-out &&
1090         test_cmp expect sparse-checkout-out &&
1091
1092         # The sparse-index reports no output
1093         test_must_be_empty sparse-index-out &&
1094
1095         # stderr: Switched to branch df-conflict-1
1096         test_cmp full-checkout-err sparse-checkout-err &&
1097         test_cmp full-checkout-err sparse-checkout-err
1098 '
1099
1100 # NEEDSWORK: 'git checkout' behaves incorrectly in the case of
1101 # directory/file conflicts, even without sparse-checkout. Use this
1102 # test only as a documentation of the incorrect behavior, not a
1103 # measure of how it _should_ behave.
1104 test_expect_success 'checkout behaves oddly with df-conflict-2' '
1105         init_repos &&
1106
1107         test_sparse_match git sparse-checkout disable &&
1108
1109         write_script edit-content <<-\EOF &&
1110         echo content >>folder2/larger-content
1111         git add folder2
1112         EOF
1113
1114         run_on_all ../edit-content &&
1115         test_all_match git status --porcelain=v2 &&
1116
1117         git -C sparse-checkout sparse-checkout init --cone &&
1118         git -C sparse-index sparse-checkout init --cone --sparse-index &&
1119
1120         test_all_match git status --porcelain=v2 &&
1121
1122         # This checkout command should fail, because we have a staged
1123         # change to folder1/larger-content, but the destination changes
1124         # folder1 to a file.
1125         git -C full-checkout checkout df-conflict-2 \
1126                 1>full-checkout-out \
1127                 2>full-checkout-err &&
1128         git -C sparse-checkout checkout df-conflict-2 \
1129                 1>sparse-checkout-out \
1130                 2>sparse-checkout-err &&
1131         git -C sparse-index checkout df-conflict-2 \
1132                 1>sparse-index-out \
1133                 2>sparse-index-err &&
1134
1135         # The full checkout deviates from the df-conflict-1 case here!
1136         # It drops the change to folder1/larger-content and leaves the
1137         # folder1 path as-is on disk. The sparse-index behaves the same.
1138         test_must_be_empty full-checkout-out &&
1139         test_must_be_empty sparse-index-out &&
1140
1141         # In the sparse-checkout case, the checkout deletes the folder1
1142         # file and adds the folder1/larger-content file, leaving all other
1143         # paths that were in folder1/ as deleted (without any warning).
1144         cat >expect <<-EOF &&
1145         D       folder2
1146         A       folder2/larger-content
1147         EOF
1148         test_cmp expect sparse-checkout-out &&
1149
1150         # Switched to branch df-conflict-1
1151         test_cmp full-checkout-err sparse-checkout-err &&
1152         test_cmp full-checkout-err sparse-index-err
1153 '
1154
1155 test_done