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

File duplicates #6

Closed
Monstrofil opened this issue Sep 23, 2020 · 8 comments
Closed

File duplicates #6

Monstrofil opened this issue Sep 23, 2020 · 8 comments

Comments

@Monstrofil
Copy link

Hi, seems this files are completely duplicated, probably one should be deleted:
https://github.com/StranikS-Scan/WorldOfTanks-Decompiled/blob/1.10/source/res/scripts/entity_defs/Account.def
https://github.com/StranikS-Scan/WorldOfTanks-Decompiled/blob/1.10/source/res/scripts/entity_defs/account.def

@Monstrofil
Copy link
Author

Monstrofil commented Sep 23, 2020

Oh, that hepls! But anyway I don't understand, why do you keep duplicates in repository?

@Monstrofil
Copy link
Author

Monstrofil commented Sep 23, 2020

WG created this problem when it started renaming its files. Duplicates are created by github automatically on the server. To fix the problems I need to create a new repo. However, when WG renames another part of the files again, the problem will appear again .... Use the archive from the zip\ folder, it always contains files with the correct names.

GitHub cannot "create duplicates" itself, that is definitely issue with git. Probably you unpack files to same folder, then commit them and push to github? I guess that is the wrong way and you should just do rm -rf in sources folder before updating files, then git will just mark files as "renamed".

Or just use Linux :)

@Monstrofil
Copy link
Author

Monstrofil commented Sep 23, 2020

Ok, what I tried:

  • run git config core.ignorecase false
  • remove everything from sources folder
  • do git add && git commit
  • run Zip-Unpacker.exe
  • run git add && git commit --amend

As a resut I got commit that removes all duplicates from repository.

@StranikS-Scan
Copy link
Owner

StranikS-Scan commented Nov 12, 2020

Probably you unpack files to same folder, then commit them and push to github?

No of course.

This problem cannot be completely solved as long as WG allows its programmers to change the case of letters in the names of scripts.

@Monstrofil
Copy link
Author

Monstrofil commented Nov 12, 2020

@StranikS-Scan what about recipe that I posted on 23 sep? Did you try it? Why do you think it is not suitable?

Here is an example with removal of duplicates from repository by guide from #6 (comment)
https://github.com/Monstrofil/WorldOfTanks-Decompiled/commit/c49eaee287fe5a95519f5553546a68563e8dc7f7

@StranikS-Scan
Copy link
Owner

This will break the chain of changes between commits in the tree. This is the same as creating a new repo. This solution does not suit me.

@Monstrofil
Copy link
Author

Chain of file changes is broken even now.

Anyway, you are the owner, so do whatever you think is better. I'm closing this issue.

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

2 participants