Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Case-insensitive FS: rename rst files to prevent collision #1528

Merged
merged 1 commit into from
Dec 12, 2024
Merged

Case-insensitive FS: rename rst files to prevent collision #1528

merged 1 commit into from
Dec 12, 2024

Conversation

efip-ns
Copy link
Contributor

@efip-ns efip-ns commented Dec 3, 2024 •
edited
Loading

There are two cases with files that have names differing only by case:

  • infiniband-diags/man/common/opt_D.rst vs. infiniband-diags/man/common/opt_d.rst
  • infiniband-diags/man/common/opt_V.rst vs. infiniband-diags/man/common/opt_v.rst

This naturally does not work on case-insensitive file systems which only get one of the files in each pair:

Cloning into 'rdma-core'...
remote: Enumerating objects: 51713, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 51713 (delta 0), reused 0 (delta 0), pack-reused 51708 (from 1)
Receiving objects: 100% (51713/51713), 15.65 MiB | 8.77 MiB/s, done.
Resolving deltas: 100% (38534/38534), done.
warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:

  'infiniband-diags/man/common/opt_D.rst'
  'infiniband-diags/man/common/opt_d.rst'
  'infiniband-diags/man/common/opt_V.rst'
  'infiniband-diags/man/common/opt_v.rst'

This PR attempts to address this minor nuisance by renaming one file of each pair to prevent collision.

@efip-ns efip-ns changed the title Case-insensitive FS: rename rest files to prevent collision Case-insensitive FS: rename rst files to prevent collision Dec 3, 2024
@rleon
Copy link
Member

rleon commented Dec 3, 2024

Please don't leave empty commit message and mention that you tried to clone this repository in Windows.

@efip-ns
Copy link
Contributor Author

efip-ns commented Dec 3, 2024 •
edited
Loading

@rleon sorry but I'm not sure I understand.

Please don't leave empty commit message

My commit message is not empty, it is Case-insensitive FS: rename rst files to prevent collision. Would you like me to change my commit message?

mention that you tried to clone this repository in Windows.

I did not mention that I "tried to clone this repository in Windows," in fact I did not mention at all where I tried to clone it, as I don't think it's relevant. I also most certainly did not try to clone it on Windows. Not sure if it's relevant but rdma-core is a submodule of a submodule of an application that I work on, and I do my development on Mac OS, where each git status produces a message that rdma-core is not updated.

@rleon
Copy link
Member

rleon commented Dec 3, 2024

@rleon sorry but I'm not sure I understand.

Please don't leave empty commit message

My commit message is not empty, it is Case-insensitive FS: rename rst files to prevent collision. Would you like me to change my commit message?

You have subject line, but commit message itself needs description.
https://github.com/linux-rdma/rdma-core/commit/da63400bce35477620bed1ad1f79ba8b31eb2759.patch
Your subject line should follow rdma-core format. Please do "git log infiniband-diags/" and use that style.

mention that you tried to clone this repository in Windows.

I did not mention that I "tried to clone this repository in Windows," in fact I did not mention at all where I tried to clone it, as I don't think it's relevant. I also most certainly did not try to clone it on Windows. Not sure if it's relevant but rdma-core is a submodule of a submodule of an application that I work on, and I do my development on Mac OS, where each git status produces a message that rdma-core is not updated.

ok, I'm using Linux and don't see such warnings at all. So please add this information to commit message.

Thanks

@efip-ns
Case-insensitive FS: rename rest files to prevent collision
ea61d3e 
On case-insensitive file systems (e.g. MacOS; XFS, JFS, and ext4 with
extensions on Linux; probably Windows too) the file names "opt_v.rst"
and "opt_V.rst" collide so that only one file exists. As a result,
each "git status" reports changes. This tries to remedy this
situation by renaming one of them to prevent the collision.

Signed-off-by: Efi P <efi.plotkin@nextsilicon.com>
@rleon rleon merged commit 1ba947a into linux-rdma:master Dec 12, 2024
14 checks passed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@efip-ns @rleon