On 10/7/2021 11:05 AM, Phillip Wood wrote: > Hi Stolee > > On 07/10/2021 14:53, Derrick Stolee wrote: >> On 10/7/2021 5:50 AM, Phillip Wood via GitGitGadget wrote: >>> From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> >> ... >>> diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh >>> index 886e78715fe..85d5279b33c 100755 >>> --- a/t/t1092-sparse-checkout-compatibility.sh >>> +++ b/t/t1092-sparse-checkout-compatibility.sh >>> @@ -484,7 +484,7 @@ test_expect_success 'checkout and reset (mixed) [sparse]' ' >>> test_expect_success 'merge, cherry-pick, and rebase' ' >>> init_repos && >>> - for OPERATION in "merge -m merge" cherry-pick rebase >>> + for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge" >> >> I spoke too soon. On my machine, the 'git rebase --apply' tests fail >> because of some verbose output that does not match across the full >> and sparse cases. Using "rebase -q --apply" works for me. > > Oh, that's strange, the CI tests pass on gitgitgadget and that script passes locally for me. Do you know what the output is that does not match? It's entirely possible that it's something in git-for-windows/git or microsoft/git that is causing the difference: + diff -u full-checkout-out sparse-checkout-out --- full-checkout-out 2021-10-07 13:37:00.475394970 +0000 +++ sparse-checkout-out 2021-10-07 13:37:00.531396095 +0000 @@ -1,3 +1,10 @@ First, rewinding head to replay your work on top of it... Applying: update folder1 +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +Merging: +e1886b3 update folder2 +virtual update folder1 +found 1 common ancestor: +virtual b4ad7e16921c16e36f1d5d45ea4fa186efa8422a Applying: update deep + return 1 error: last command exited with $?=1 [1] https://github.com/microsoft/git/runs/3827705316?check_suite_focus=true#step:5:10469 Thanks, -Stolee
