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 for trailing CR character with omni completion on Windows. #152

Merged
merged 1 commit into from
May 2, 2024

Conversation

syringus
Copy link
Contributor

@syringus syringus commented Dec 29, 2023

Fixes #151.

This issue manifests on Windows OS, because CRLF is used here for end of
line and systemlist() function splits lines on LF cahracter.
system() function takes care of OS specific end of line chars.
Copy link
Member

@alerque alerque left a comment

Choose a reason for hiding this comment

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

Can we please split these two commits into two PRs since the topic is completely different. The balance and register command stuff can be based on your branch with the split fixes so we don't have to do that merge work twice. I'll just merge it afterwards, but we have a test issue and it would be a lot easier to review and figure out the regression with only one fix going on at a time.

@syringus
Copy link
Contributor Author

Of course. This was not my intention. I made a mistake and commited my experiments with balance and register commands to this branch.

Now I am not sure how to proceed. Should I close this PR and create a new one containing only the split fixes? Or adding new commit to this PR that reverts changes in last commit (balance and register commands) is better approach?

Thanks.
Martin

@alerque
Copy link
Member

alerque commented Dec 30, 2023

No need to close this, just shuffle things around.

Untested from memory, but you'll want something like this:

# Save your current state in a new branch
git branch extra-commands

# Reset your current branch to the previous commit
git reset --hard HEAD^

# Push the new (now reset) state of this branch back here
git push --force

# Switch to your other branch to keep working on that
git switch extra-commands

# Push the new branch and open a new PR for it
git push

@syringus
Copy link
Contributor Author

Great, thanks.

I will do it next week, when I'm back at home.

@alerque alerque merged commit 2e3355c into ledger:master May 2, 2024
3 of 5 checks passed
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.

Trailing CR when using omni completion on Windows
2 participants