diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-13 13:39:26 -0800 |
| commit | 03dfe4e1afd7314f830703d9559504268863cf1f (patch) | |
| tree | bf0abeb7ee62d7ebcbbf2acac9274ed6dcf1a3cf /t | |
| parent | 94336d77bcbf4360b67a9454d8bf2e84b3d88ae7 (diff) | |
| parent | fb1b786ebfab18b851ce1fa94d5063daf11f647f (diff) | |
| download | git-03dfe4e1afd7314f830703d9559504268863cf1f.tar.xz | |
Merge branch 'sb/merge-ours-sparse'
"git merge-ours" is taught to work better in a sparse checkout.
* sb/merge-ours-sparse:
merge-ours: integrate with sparse-index
merge-ours: drop USE_THE_REPOSITORY_VARIABLE
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1092-sparse-checkout-compatibility.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index b0f691c151..d98cb4ac11 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -2559,4 +2559,18 @@ test_expect_success 'cat-file --batch' ' ensure_expanded cat-file --batch <in ' +test_expect_success 'merge -s ours' ' + init_repos && + + test_all_match git rev-parse HEAD^{tree} && + test_all_match git merge -s ours merge-right && + test_all_match git rev-parse HEAD^{tree} && + test_all_match git rev-parse HEAD^2 +' + +test_expect_success 'sparse-index is not expanded: merge-ours' ' + init_repos && + ensure_not_expanded merge -s ours merge-right +' + test_done |