diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-12-24 23:04:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-09 16:07:26 +0000 |
| commit | 48b306e7d63d8487ebe708b7109cc9a6ef4b4374 (patch) | |
| tree | 89e94972591dd9bc89591a40d3b086430f8fc5e6 /modules/shell | |
| parent | 0683b737b1d95ca758aacc56acd8f3a991fa3336 (diff) | |
| download | nixlib-48b306e7d63d8487ebe708b7109cc9a6ef4b4374.tar nixlib-48b306e7d63d8487ebe708b7109cc9a6ef4b4374.tar.gz nixlib-48b306e7d63d8487ebe708b7109cc9a6ef4b4374.tar.bz2 nixlib-48b306e7d63d8487ebe708b7109cc9a6ef4b4374.tar.lz nixlib-48b306e7d63d8487ebe708b7109cc9a6ef4b4374.tar.xz nixlib-48b306e7d63d8487ebe708b7109cc9a6ef4b4374.tar.zst nixlib-48b306e7d63d8487ebe708b7109cc9a6ef4b4374.zip | |
modules/git: remove json diff formatter
Using the formatter means that if the two inputs differ only by whitespace, Git won't show a diff.
Diffstat (limited to 'modules/shell')
| -rw-r--r-- | modules/shell/git/config.in | 2 | ||||
| -rw-r--r-- | modules/shell/git/default.nix | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in index 8e2243bec31b..2f682170c614 100644 --- a/modules/shell/git/config.in +++ b/modules/shell/git/config.in @@ -28,8 +28,6 @@ compactionHeuristic = true renameLimit = 0 wsErrorHighlight = all -[diff "json"] - textconv = @python@/bin/python -m json.tool [diff "mozlz4"] textconv = @mozlz4_textconv@ [filter "lfs"] diff --git a/modules/shell/git/default.nix b/modules/shell/git/default.nix index 9b1d6efa8235..0ce272e903ac 100644 --- a/modules/shell/git/default.nix +++ b/modules/shell/git/default.nix @@ -6,7 +6,6 @@ let isExecutable = true; inherit (pkgs) execline mozlz4a; - python = pkgs.python3; }; config = pkgs.substituteAll { |