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

Duplicate sample.md documents breaking Git on macOS #1879

Open
mwhamgenomics opened this issue Jan 20, 2022 · 0 comments
Open

Duplicate sample.md documents breaking Git on macOS #1879

mwhamgenomics opened this issue Jan 20, 2022 · 0 comments

Comments

@mwhamgenomics
Copy link
Contributor

There are two 'sample.md' files in docs/manual/data-models, one capitalised and one not. As a result, when I check out this repo onto a macOS machine, I get the following:

% git clone https://github.com/opencb/opencga.git
Cloning into 'opencga'...
[...]
Resolving deltas: 100% (141951/141951), 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:

  'docs/manual/data-models/Sample.md'
  'docs/manual/data-models/sample.md'

Since macOS's filesystem is case-insensitive by default, I'm then stuck with uncommitted changes:

% git status -s
 M docs/manual/data-models/Sample.md
% git checkout docs/manual/data-models/Sample.md
Updated 1 path from the index
% git status -s                                 
 M docs/manual/data-models/sample.md
% git checkout docs/manual/data-models/sample.md
Updated 1 path from the index
% git status -s                                 
 M docs/manual/data-models/Sample.md
% git checkout v2.1.2
error: Your local changes to the following files would be overwritten by checkout:
	docs/manual/data-models/Sample.md
Please commit your changes or stash them before you switch branches.
Aborting

I tried git config core.ignorecase false, but got the same results. This problem might also be happening on Windows 10. Checking out the repo in Linux works as normal, but I notice that the Sample.md file in the GitHub repo does not appear in my checked out clone:

$ git clone https://github.com/opencb/opencga.git
Cloning into 'opencga'...
[...]
$ cd opencga/
$ ls docs/data-models/?ample.md
docs/data-models/sample.md
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

No branches or pull requests

1 participant