tomatenquark / code

The code that powers Tomatenquark
https://tomatenquark.github.io/
Other
34 stars 5 forks source link

Some icon files in this repository are permanently marked as modified #57

Closed Calinou closed 4 years ago

Calinou commented 4 years ago

OS: Fedora 31 Git version: 2.25.4

Git configuration ```gitconfig [commit] gpgsign = true [user] name = xxx email = xxx [alias] lg = log --color --pretty=format:'%C(245)%h%Creset %C(yellow)%ci %C(white bold)%>(24)%an%Creset -%C(bold magenta)%d%Creset %s' --abbrev-commit addnw = !sh -c 'git diff -U0 -w --no-color "$@" | git apply --cached --ignore-whitespace --unidiff-zero -' [core] pager = delta --plus-color="#012800" --minus-color="#340001" --theme='Monokai Extended' [branch] [pull] rebase = true [color] ui = true [color "diff-highlight"] oldNormal = red bold oldHighlight = red bold 52 newNormal = green bold newHighlight = green bold 22 [color "diff"] meta = yellow frag = magenta bold commit = yellow bold old = red bold new = green bold whitespace = red reverse [hub] protocol = ssh [tag] forceSignAnnotated = true [interactive] diffFilter = delta --color-only [filter "lfs"] process = git-lfs filter-process required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f ```

Whenever I'm switching branches or doing anything, these files keep being marked as if they were modified:

M   cmake/vcpp/cube2.ico
M   cmake/xcode/Resources/help/sauer16.png
M   cmake/xcode/Resources/help/sauer32.png
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
cmake/vcpp/cube2.ico                       | Bin 115679 -> 131 bytes
cmake/xcode/Resources/help/sauer16.png     | Bin 921 -> 128 bytes
cmake/xcode/Resources/help/sauer32.png     | Bin 2618 -> 129 bytes

Due to this, I have to go out of my way to make sure not to accidentally commit them when making pull requests. This is probably related to remains from Git LFS in one way or another. I'm not sure how it could be fixed.

Fohlen commented 4 years ago

Yeah, we can safely put these to the gitignore list and use git add -f if we ever intend to change them.