hraban / tomono

Multi- To Mono-repository merge
https://tomono.0brg.net
GNU Affero General Public License v3.0
842 stars 138 forks source link

case-sensitive branch-names break on Windows #45

Closed asinning closed 2 years ago

asinning commented 2 years ago

If two repos have branches which differ only in upper/lower-case, then the merge will fail on Windows

hraban commented 2 years ago

Interesting, but is that a git ↔ Windows problem, or a tomono specific problem?

Can you do this on Windows?

git init
git commit -m root --allow-empty
git checkout -b foo
git checkout -b FOO

If not, I think the problem is a wider git + windows one, not a tomono one. You'd have to get this fixed upstream.

See also:

hraban commented 2 years ago

the workaround they propose in that SO question seems like a good choice btw: clone one of the repos to a case sensitive filesystem, rename the branch to match the other's case, then merge that in, instead.

hraban commented 2 years ago

Closing as WONTFIX since this seems to be by design on Windows, and the problems are upstream, not here. There is a work-around (see SO). Feel free to continue discussing if relevant.