t1092: run "rebase --apply" without "-q" in testing
We run a few operations and make sure they produce identical results with and without sparse-index; the version we merged to the "next" branch used the "-q" option to work around a breakage caused by a version used at Microsoft with some unreleased changes, but since we would want to make sure the commands produce identical results, including reports given to the output that lists which commits were picked, use of "-q" loses too much interesting information. Let's drop "-q" from the command invocation and revisit the issue when the problematic changes are upstreamed. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Helped-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Oct 16, 2021 at 09:07 UTC
5e311edfd3717373912df8239daba6903d78b7bd
1 file changed
+1
-1
t/t1092-sparse-checkout-compatibility.sh
+1
-1
@@ -484,7 +484,7 @@ test_expect_success 'checkout and reset (mixed) [sparse]' '
484
test_expect_success 'merge, cherry-pick, and rebase' '
485
init_repos &&
486
487
- for OPERATION in "merge -m merge" cherry-pick "rebase --apply -q" "rebase --merge"
487
+ for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
488
do
489
test_all_match git checkout -B temp update-deep &&
490
test_all_match git $OPERATION update-folder1 &&