Skip to content

Show git diff command on checkfile failure #19308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

nicolasstucki
Copy link
Contributor

@nicolasstucki nicolasstucki commented Dec 20, 2023

This diff is more familiar and consistent across systems. We can assume that all developers of Dotty have git installed.

When a checkfile fails we now show

Test output dumped in: tests/run/xyz.check.out
- See diff of the checkfile (`brew install icdiff` for colored diff)
-   > diff tests/run/xyz.check tests/run/xyz.check.out
+ See diff of the checkfile (`--color=always` for colored diff)
+   > git diff --no-index -- tests/run/xyz.check tests/run/xyz.check.out
  Replace checkfile with current output
    > mv tests/run/xyz.check.out tests/run/xyz.check

@nicolasstucki nicolasstucki marked this pull request as ready for review December 20, 2023 10:47
This diff is more familiar and consistent across systems. We can assume
that all developers of Dotty have git installed.

When a checkfile fails we now show
```diff
Test output dumped in: tests/run/xyz.check.out
- See diff of the checkfile (`brew install icdiff` for colored diff)
-   > diff tests/run/xyz.check tests/run/xyz.check.out
+ See diff of the checkfile (`--color=always` for colored diff)
+   > git diff --no-index -- tests/run/xyz.check tests/run/xyz.check.out
  Replace checkfile with current output
    > mv tests/run/xyz.check.out tests/run/xyz.check
```
@nicolasstucki nicolasstucki force-pushed the show-git-diff-command-on-checkfile-failure branch from 4e88857 to b5479c5 Compare December 20, 2023 10:49
@bishabosha bishabosha merged commit 8b2d1dd into scala:main Dec 20, 2023
@bishabosha bishabosha deleted the show-git-diff-command-on-checkfile-failure branch December 20, 2023 16:22
@Kordyjan Kordyjan added this to the 3.4.1 milestone Feb 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants