From 51de3a3a9e69d080ed9b3c01f51a14ac21698e38 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 15 Oct 2019 19:16:03 +0000 Subject: 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. --- modules/shell/git/attributes | 1 - modules/shell/git/config.in | 2 -- 2 files changed, 3 deletions(-) (limited to 'modules/shell') 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 -- cgit 1.4.1