fix(git): broken line endings corrupt git index after weaver merge #2302
Assignees
Labels
bug
Something isn't working
dependencies
Pull requests that update a dependency file
Developer_Experience
P1
Priority 1: Highest
Weaver
Tasks related to the future of Cactus & Weaver together.
Comments
petermetz
added
dependencies
petermetz
added a commit
to petermetz/cacti
that referenced
this issue
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 <[email protected]>
petermetz
referenced
this issue
in petermetz/cacti
Feb 27, 2023
Housekeeping of the documents that mention usernames. Had to skip changing the username in the ./weaver/*.md because of the newline index corruption problem explained in https://github.com/hyperledger/cacti/issues/2302 Resolves hyperledger-cacti#2304 Signed-off-by: Peter Somogyvari <[email protected]>
petermetz
added a commit
to petermetz/cacti
that referenced
this issue
Feb 28, 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 <[email protected]>
petermetz
added a commit
that referenced
this issue
Feb 28, 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 #2302 Signed-off-by: Peter Somogyvari <[email protected]>
petermetz
referenced
this issue
Feb 28, 2023
Housekeeping of the documents that mention usernames. Had to skip changing the username in the ./weaver/*.md because of the newline index corruption problem explained in https://github.com/hyperledger/cacti/issues/2302 Resolves #2304 Signed-off-by: Peter Somogyvari <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Describe the bug
There 34 files in the git index (with no actual changes) after a rebase onto upstream/main.
This only happens on Linux based operating systems (Ubuntu in this case).
The issue is invisible on the Windows operating system.
To Reproduce
Clone the project on Ubuntu 20.04
Observe that your git index is now corrupted as shown on the screenshot below.
Expected behavior
Cloning the project leaves you with an empty index instead of having it corrupted.
Logs/Stack traces
https://stackoverflow.com/a/4683783
Screenshots
Cloud provider or hardware configuration:
Dev machine
Operating system name, version, build:
Ubuntu 20.04
Hyperledger Cactus release version or commit (git rev-parse --short HEAD):
mainHyperledger Cactus Plugins/Connectors Used
N/A
Additional context
More information on the issue and the proposal to fix it: https://stackoverflow.com/a/15646791
The text was updated successfully, but these errors were encountered: