开发者

Can I make git diff ignore permission changes

开发者 https://www.devze.com 2023-01-07 21:24 出处:网络
I inadvertedly change the permissions of my entire tree and commit that change along with other content 开发者_运维知识库changes.

I inadvertedly change the permissions of my entire tree and commit that change along with other content 开发者_运维知识库changes.

I use something like :

tar -czf deploy.tar git diff --name-only v1 v2

to generate a tar with the modified files between two tags, the problem is that now because of the permissions change almost all my tree is listed as modified.

Is there a way that I could tell git diff to ignore those files which only has the permissions changed?


This will tell git to ignore permissions:

git config core.filemode false


Use the -G<regex> option ("Look for differences whose patch text contains added/removed lines that match <regex>.") searching for any changes at all - i.e. .. Permissions-only changes don't match this, so they are ignored.

So: git diff -G.


I had this problem after intentionally removing the execute permission from source code files (~26K files). Then, git diff says that all files have changed! The answer with core.filemode does not help me since that only affects diffs against your working dir, not diffs against 2 commits in the repo.

The answer was to use the (big scary) filter-branch command. In particular, all you need to type is:

git filter-branch -f --tree-filter 'find * -type f | xargs chmod 644' -- --all

from the root of your working dir. Of course, be sure to make a copy of your repo first, i.e.

cp -pr ~/repo.git ~/repo-orig.git

or similar, in case you need to re-try.

Enjoy!

0

精彩评论

暂无评论...
验证码 换一张
取 消

关注公众号