Skip to content

Commit 5e311ed

Browse files
phillipwoodgitster
authored andcommitted
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 <[email protected]> Helped-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f751097 commit 5e311ed

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ test_expect_success 'checkout and reset (mixed) [sparse]' '
484484
test_expect_success 'merge, cherry-pick, and rebase' '
485485
init_repos &&
486486
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"
488488
do
489489
test_all_match git checkout -B temp update-deep &&
490490
test_all_match git $OPERATION update-folder1 &&

0 commit comments

Comments
 (0)