Menu
I am having issues with my git on a windows machine. I always have some git files that are modified in every repo, the files that show as modified are same.
If I clone a new repo and use tortoisegit to commit I see some files as modified, even if I never touched a single file in the repo. "gitstatus" doesnt show any modifications though
Any help is appreciated. Thanks
378
Remove every file from Git's index. git rm --cached -r .
Tracking New Files The git add command takes a path name for either a file or a directory; if it's a directory, the command adds all the files in that directory recursively.
Git stores the complete history of your files for a project in a special directory (a.k.a. a folder) called a repository, or repo. This repo is usually in a hidden folder called . git sitting next to your files.
To add and commit files to a Git repository Enter git add --all at the command line prompt in your local project directory to add the files or changes to the repository. Enter git status to see the changes to be committed.
Check if the changes are merely changes in file permissions. This was the reason in my case, both TortoiseGit and Git Extensions displayed unmodified files.
Use git config core.fileMode false to ignore chmod differences (or directly edit the .git/config file).
You may also want to set this as the global config with git config --global core.filemode false.
131
It's line endings issue. Set this on your windows machine:
git config --global core.autocrlf true
None of the proposed fixes worked for me. However, I had Cygwin installed and TortoiseGit picked up its path when installed. I solved it by installing the official Git package and changed the path in TortoiseGit.
36
If using TortoiseGit with Cygwin git (not officially supported), several extra setup steps should be done:
Select the [CYGWIN-INSTALL-PATH]\bin-folder as git.exe folder.
Configure the HOME environment variable in Windows, so that Cygwin and TortoiseGit are using the same home directory and global git-config. Use the normal Windows notation here (e.g., C:\Users\USERNAME). By default, TortoiseGit uses the Windows home directory which is normally located under c:\Users and Cygwin uses its own home directories which are located under [CYGWIN-INSTALL-PATH]\home.
Configure AutoCrLf, this is necessary as TortoiseGit and Cygwin Git have different defaults. The default in Cygwin Git is true.
Go to TortoiseGit the section called Advanced Settings and set CygwinHack to true in order to activate cygwin workarounds.
Reboot.
Step #4 is crucial and resolved the problem for me.
Reference (see Cygwin Git section): https://tortoisegit.org/docs/tortoisegit/tgit-dug-settings.html
35
Just posting it as a answer here because it might help someone else.
If you have Cygwin and Tortoise Git installed, then it will simply show many files when you try to merge the code with 0 lines added and 0 lines removed which is kind of irritating.
I tried adding the above options in git config but it did not help.
You can simply right click on any folder go to
Tortoise Settings -> General -> Rerun First Time Wizard
Now here you can change the path to git.exe by pointing to other Git.exe or if you have Gitbash installed you can point to its git.exe also. Just make sure the already existing path should be something from Cygwin/bin/git.exe which should be updated to other git.exe.
40
I just had this problem and for me the fix turned out to be quite simple.
Ensure there are no git processes currently running and then delete .git\index.lock.
After this the modified state of my files were handled correctly.
22
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
