fix(git): broken line endings corrupt git index after weaver merge #2303
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
petermetz
requested review from
takeutak,
izuru0,
jagpreetsinghsasan and
VRamakrishna
as code owners
|
Source and credits for the git commands go to: https://stackoverflow.com/a/1511273 |
takeutak
approved these changes
Feb 27, 2023
Not yet sure if this will fix the issue, but based on my research this is the easiest and most probable solution. Leaving a "paper trail" of the magical git commands that were executed in order to have an idea in the future on how to fix potential negative side-effects that might come out of this later (not likely but if it does happen this should be immensely helpful information) Without further ado, the list of commands executed to achieve this diff: git rm --cached -r . git config core.autocrlf input git diff --cached --name-only -z | xargs -0 git add Fixes hyperledger-cacti#2302 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
petermetz
force-pushed
the
petermetz/issue2302
branch
from
bc0c3a9 to
18ed447
Compare
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.
Not yet sure if this will fix the issue, but based on my research this
is the easiest and most probable solution.
Leaving a "paper trail" of the magical git commands that were executed
in order to have an idea in the future on how to fix potential negative
side-effects that might come out of this later (not likely but if it
does happen this should be immensely helpful information)
Without further ado, the list of commands executed to achieve this diff:
git rm --cached -r .
git config core.autocrlf input
git diff --cached --name-only -z | xargs -0 git add
Fixes #2302
Signed-off-by: Peter Somogyvari peter.somogyvari@accenture.com