mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

t1092: run "rebase --apply" without "-q" in testing

Browse source 
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>
This commit is contained in:
Phillip Wood 2021-10-16 09:07:09 +00:00 committed by Junio C Hamano
parent f751097be3
commit 5e311edfd3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/t1092-sparse-checkout-compatibility.sh
View file

@ -484,7 +484,7 @@ test_expect_success 'checkout and reset (mixed) [sparse]' '
test_expect_success 'merge, cherry-pick, and rebase' ' test_expect_success 'merge, cherry-pick, and rebase' '
init_repos && init_repos &&
for OPERATION in "merge -m merge" cherry-pick "rebase --apply -q" "rebase --merge" for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
do do
test_all_match git checkout -B temp update-deep && test_all_match git checkout -B temp update-deep &&
test_all_match git $OPERATION update-folder1 && test_all_match git $OPERATION update-folder1 &&