-
Notifications
You must be signed in to change notification settings - Fork 69
dsync: fix -L,--dereference option ignored #625
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
Conversation
This commit fixes dsync ignoring -L,--dereference option because of a missing break in the case statement, causing walk/copy options to be overwritten by -P,--no-dereference values. Signed-off-by: Rémi Palancher <remi@rackslab.io>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good catch!
Hi could you rebase your branch and please sign your commit and push it again, I will merge it as soon as it's done. |
Hi @carbonneau1, I double-checked and I think everything is good. What did I miss? |
Git is asking me to rebase and merge, causing an unsigned commit. Could you rebase your local branch with main and force push it back to your remote? |
The parent of my commit rezib@0f23422 is rezib@9d463ca which is also the last commit pushed in main branch. I don't understand why git is unable to ff merge here 🤔 |
I really want your fix in. Let me take a look again. |
FWIW, it appears the "Squash and merge" button works here |
I have only a rebase and merge button! |
Sorry guys, not used to GUI yet. Let me try the squash and merge. |
Thank you Dalton. Squashed and merged! |
You're welcome! In general I recommend the "Squash and merge" for most merges. It squashes all commits in the PR into one and commits it. So no merge commits and the history is clean :) |
This commit fixes dsync ignoring -L,--dereference option because of a missing break in the case statement, causing walk/copy options to be overwritten by -P,--no-dereference values.