diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-10-15 19:16:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-10-15 19:16:03 +0000 |
| commit | 51de3a3a9e69d080ed9b3c01f51a14ac21698e38 (patch) | |
| tree | 524e633a531288429941045fbce53e0a69a6b62e /modules/shell | |
| parent | 80bb71f7ae6c1c3ededc4787ad56a292d4e5dda6 (diff) | |
| download | nixlib-51de3a3a9e69d080ed9b3c01f51a14ac21698e38.tar nixlib-51de3a3a9e69d080ed9b3c01f51a14ac21698e38.tar.gz nixlib-51de3a3a9e69d080ed9b3c01f51a14ac21698e38.tar.bz2 nixlib-51de3a3a9e69d080ed9b3c01f51a14ac21698e38.tar.lz nixlib-51de3a3a9e69d080ed9b3c01f51a14ac21698e38.tar.xz nixlib-51de3a3a9e69d080ed9b3c01f51a14ac21698e38.tar.zst nixlib-51de3a3a9e69d080ed9b3c01f51a14ac21698e38.zip | |
modules/git: drop plist diffing
/usr/bin/plist only exists on macOS, and I don't often find myself diffing plists now I don't use it, so it's easier to drop this than try to get it working. Having this here on other operating systems means git log -G, for example, will fail when it hits a commit that modifies a plist.
Diffstat (limited to 'modules/shell')
| -rw-r--r-- | modules/shell/git/attributes | 1 | ||||
| -rw-r--r-- | modules/shell/git/config.in | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/modules/shell/git/attributes b/modules/shell/git/attributes index 24cb25b10aa7..57ea092a232a 100644 --- a/modules/shell/git/attributes +++ b/modules/shell/git/attributes @@ -1,3 +1,2 @@ *.json diff=json -*.plist diff=plist *.json.mozlz4 diff=mozlz4 diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in index 3630759a5a32..c9983ba5014d 100644 --- a/modules/shell/git/config.in +++ b/modules/shell/git/config.in @@ -32,8 +32,6 @@ textconv = @python@/bin/python -m json.tool [diff "mozlz4"] textconv = @mozlz4_textconv@ -[diff "plist"] - textconv = /usr/bin/plutil -convert xml1 -o - [filter "lfs"] clean = git-lfs clean -- %f required = true |