fix(diff): use arg '--strip-trailing-cr' #949
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
umarcor
force-pushed
the
fix-diff
branch
2 times, most recently
from
854aeb0 to
e78a0a7
Compare
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
force-pushed
the
fix-diff
branch
2 times, most recently
from
d7c7022 to
bd40356
Compare
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
Closed
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
|
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
force-pushed
the
fix-diff
branch
2 times, most recently
from
6d7a045 to
e431bfd
Compare
umarcor
added a commit
to umarcor/cobra
that referenced
this pull request
Feb 8, 2021
github-actions
bot
added
the
area/cli [deprecated]
umarcor
added a commit
to umarcor/cobra
that referenced
this pull request
Feb 21, 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
Closed
Closed
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
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) | |||
There was a problem hiding this comment.
Seems reasonable to me!! Thanks for this! And all the patience
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.