Skip to content

Commit

Permalink
Auto merge of #12241 - weihanglo:fix-git-cli-output, r=epage
Browse files Browse the repository at this point in the history
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/
  • Loading branch information
bors authored and weihanglo committed Jun 8, 2023
1 parent 1971cb6 commit 3ca8c6f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tests/testsuite/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 [..]
Expand Down

0 comments on commit 3ca8c6f

Please sign in to comment.