Skip to content

Commit 69ea85c

Browse files
committed
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]: ``` <flag> <summary> <from> -> <to> [<reason>] ``` 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/
2 parents 41d662b + 51ebba2 commit 69ea85c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/testsuite/git.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2711,7 +2711,7 @@ fn use_the_cli() {
27112711
[UPDATING] git repository `[..]`
27122712
[RUNNING] `git fetch [..]`
27132713
From [..]
2714-
* [new ref] -> origin/HEAD
2714+
* [new ref] [..] -> origin/HEAD[..]
27152715
[CHECKING] dep1 [..]
27162716
[RUNNING] `rustc [..]`
27172717
[CHECKING] foo [..]

0 commit comments

Comments
 (0)