Skip to content

Commit 5f089a6

Browse files
derrickstoleedscho
authored andcommitted
TO-CHECK: t1092: use quiet mode for rebase tests
TODO: This might no longer be necessary. * t1092: add quiet mode for some rebase tests because the stderr output can change in some of the modes. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
1 parent e10a6f5 commit 5f089a6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,7 +1059,9 @@ test_expect_success 'read-tree --merge with directory-file conflicts' '
10591059
test_expect_success 'merge, cherry-pick, and rebase' '
10601060
init_repos &&
10611061
1062-
for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
1062+
# microsoft/git specific: we need to use "quiet" mode
1063+
# to avoid different stderr for some rebases.
1064+
for OPERATION in "merge -m merge" cherry-pick "rebase -q --apply" "rebase -q --merge"
10631065
do
10641066
test_all_match git checkout -B temp update-deep &&
10651067
test_all_match git $OPERATION update-folder1 &&

0 commit comments

Comments
 (0)