From 3ca8c6ff2be99e1d33454adc40922f5acef463a7 Mon Sep 17 00:00:00 2001 From: bors Date: Wed, 7 Jun 2023 22:10:27 +0000 Subject: [PATCH] Auto merge of #12241 - weihanglo:fix-git-cli-output, r=epage test: loose overly matches for git cli output The output format should be stable I believe, but it turns out not. This is how `git fetch` man page says [^1]: ``` -> [] ``` In Git 2.41 they've changed the fetch output a bit [^2]. I think let's just loose it to prevent future breakages. [^1]: https://git-scm.com/docs/git-fetch#_output [^2]: https://github.blog/2023-06-01-highlights-from-git-2-41/ --- tests/testsuite/git.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index 09119203783..7c717e9671c 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -2711,7 +2711,7 @@ fn use_the_cli() { [UPDATING] git repository `[..]` [RUNNING] `git fetch [..]` From [..] - * [new ref] -> origin/HEAD + * [new ref] [..] -> origin/HEAD[..] [CHECKING] dep1 [..] [RUNNING] `rustc [..]` [CHECKING] foo [..]