Skip to content
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

fix(diff): use arg '--strip-trailing-cr' #949

Merged
merged 1 commit into from Nov 16, 2021
Merged

Conversation

umarcor
Copy link
Contributor

@umarcor umarcor commented Sep 5, 2019

Running the tests on windows, when two files do not match, diff shows all the content as changed. This PR tells diff to ignore line endings, so it is easier to find the differences.

@umarcor umarcor force-pushed the fix-diff branch 2 times, most recently from 854aeb0 to e78a0a7 Compare Sep 17, 2019
umarcor added a commit to umarcor/cobra that referenced this pull request Oct 2, 2019
umarcor added a commit to umarcor/cobra that referenced this pull request Oct 2, 2019
umarcor added a commit to umarcor/cobra that referenced this pull request Oct 2, 2019
umarcor added a commit to umarcor/cobra that referenced this pull request Oct 14, 2019
@umarcor
Copy link
Contributor Author

umarcor commented Dec 23, 2019

Request to be included in 1.0.0. Ref #959.

@umarcor umarcor force-pushed the fix-diff branch 2 times, most recently from d7c7022 to bd40356 Compare Jan 4, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request Jan 4, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request Jan 6, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request Jan 22, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request Jan 22, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request Feb 3, 2020
@umarcor umarcor mentioned this pull request Feb 3, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request Feb 20, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request Mar 1, 2020
@umarcor
Copy link
Contributor Author

umarcor commented Apr 13, 2020

ping @jharshman

umarcor added a commit to umarcor/cobra that referenced this pull request Apr 13, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request May 11, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request May 11, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request May 11, 2020
umarcor added a commit to umarcor/cobra that referenced this pull request Dec 4, 2020
@umarcor umarcor force-pushed the fix-diff branch 2 times, most recently from 6d7a045 to e431bfd Compare Feb 2, 2021
umarcor added a commit to umarcor/cobra that referenced this pull request Feb 8, 2021
@github-actions github-actions bot added the area/cli [deprecated] For the cobra CLI !!! moved to spf13/cobra-cli label Feb 21, 2021
umarcor added a commit to umarcor/cobra that referenced this pull request Feb 21, 2021
@github-actions
Copy link

github-actions bot commented Apr 23, 2021

This PR is being marked as stale due to a long period of inactivity

umarcor added a commit to umarcor/cobra that referenced this pull request May 3, 2021
@umarcor umarcor mentioned this pull request Jun 29, 2021
umarcor added a commit to umarcor/cobra that referenced this pull request Nov 4, 2021
umarcor added a commit to umarcor/cobra that referenced this pull request Nov 4, 2021
umarcor added a commit to umarcor/cobra that referenced this pull request Nov 5, 2021
umarcor added a commit to umarcor/cobra that referenced this pull request Nov 10, 2021
umarcor added a commit to umarcor/cobra that referenced this pull request Nov 15, 2021
jpmcb
jpmcb approved these changes Nov 16, 2021
@@ -43,7 +43,7 @@ func compareFiles(pathA, pathB string) error {
// Don't execute diff if it can't be found.
return nil
}
diffCmd := exec.Command(diffPath, "-u", pathA, pathB)
diffCmd := exec.Command(diffPath, "-u", "--strip-trailing-cr", pathA, pathB)
Copy link
Collaborator

@jpmcb jpmcb Nov 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems reasonable to me!! Thanks for this! And all the patience

@jpmcb jpmcb merged commit 62a72cd into spf13:master Nov 16, 2021
11 checks passed
@umarcor umarcor deleted the fix-diff branch Nov 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cli [deprecated] For the cobra CLI !!! moved to spf13/cobra-cli
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants