8000 dsync: fix -L,--dereference option ignored by rezib · Pull Request #625 · hpc/mpifileutils · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

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

Merged
merged 1 commit into from
Feb 27, 2025

Conversation

rezib
Copy link
Contributor
@rezib rezib commented Feb 25, 2025

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.

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>
Copy link
Collaborator
@carbonneau1 carbonneau1 left a comment

Choose a reason for hiding this comment

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

good catch!

@carbonneau1
Copy link
Collaborator
carbonneau1 commented Feb 27, 2025

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.

@rezib
Copy link
Contributor Author
rezib commented Feb 27, 2025

Hi @carbonneau1, I double-checked and I think everything is good. What did I miss?

@carbonneau1
Copy link
Collaborator

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?

@rezib
Copy link
Contributor Author
rezib commented Feb 27, 2025

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 🤔

@carbonneau1
Copy link
Collaborator

I really want your fix in. Let me take a look again.

@daltonbohning
Copy link
Collaborator

FWIW, it appears the "Squash and merge" button works here

@carbonneau1
Copy link
Collaborator

I have only a rebase and merge button!

@daltonbohning
Copy link
Collaborator

I have only a rebase and merge button!

Interesting. I see this
image

@carbonneau1
Copy link
Collaborator

Sorry guys, not used to GUI yet. Let me try the squash and merge.

@carbonneau1 carbonneau1 merged commit eac8d8a into hpc:main Feb 27, 2025
1 check passed
@carbonneau1
Copy link
Collaborator

Thank you Dalton. Squashed and merged!

@daltonbohning
Copy link
Collaborator

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 :)

@rezib rezib mentioned this pull request Mar 21, 2025
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.

3 participants
0