Commit 9802479
committed
Sparse index:
This change enables running the `diff` builtin command without
expanding the full index in a cone-mode sparse checkout. It adds basic
infrastructure to "light up" sparse index for this command.
Additionally, it includes tests to verify sparse index is working as
expected. These tests ensure that:
1. The index is not expanded for `diff` and `diff --staged` (which both
involve reading from the index).
2. `diff` and `diff --staged` behave the same in full
checkout, sparse checkout, and sparse index repositories in the following
partially-staged scenarios (i.e. the index, HEAD, and working directory
differ at a given path):
1. Path is within sparse-checkout cone.
2. Path is outside sparse-checkout cone.
3. Merge conflict for paths outside sparse-checkout cone.git diff
1 parent f28fc01 commit 9802479
2 files changed
Lines changed: 58 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
437 | 437 | | |
438 | 438 | | |
439 | 439 | | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
440 | 443 | | |
441 | 444 | | |
442 | 445 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
387 | 387 | | |
388 | 388 | | |
389 | 389 | | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
390 | 439 | | |
391 | 440 | | |
392 | 441 | | |
| |||
822 | 871 | | |
823 | 872 | | |
824 | 873 | | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
825 | 880 | | |
826 | 881 | | |
827 | 882 | | |
| |||
0 commit comments