diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-04-26 04:20:00 -0500 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2020-05-05 00:12:58 +0200 |
| commit | cba7b6ee6e056421f862b008b45f1ff9cc2e7252 (patch) | |
| tree | c7b7817d7e600f806874bd03e856d88e0707f999 /tests/modules/programs/git | |
| parent | 03b4f81679456dc565722b38b18c27911b135d66 (diff) | |
git: add basic support for delta
PR #1198
Diffstat (limited to 'tests/modules/programs/git')
| -rw-r--r-- | tests/modules/programs/git/git-expected.conf | 6 | ||||
| -rw-r--r-- | tests/modules/programs/git/git.nix | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/modules/programs/git/git-expected.conf b/tests/modules/programs/git/git-expected.conf index 45ba08db371..a4457adfabb 100644 --- a/tests/modules/programs/git/git-expected.conf +++ b/tests/modules/programs/git/git-expected.conf @@ -6,6 +6,9 @@ [commit] gpgSign = true +[core] + pager = "@deltaCommand@ --dark" + [extra] boolean = true integer = 38 @@ -28,6 +31,9 @@ [gpg] program = "path-to-gpg" +[interactive] + diffFilter = "@deltaCommand@ --dark --color-only" + [user] email = "user@example.org" name = "John Doe" diff --git a/tests/modules/programs/git/git.nix b/tests/modules/programs/git/git.nix index d3c586fec58..54e3c79b43d 100644 --- a/tests/modules/programs/git/git.nix +++ b/tests/modules/programs/git/git.nix @@ -15,6 +15,8 @@ let pkgs.substituteAll { src = path; + deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta"; + git_include_path = pkgs.writeText "contents" (builtins.readFile ./git-expected-include.conf); }; @@ -56,6 +58,10 @@ in { userEmail = "user@example.org"; userName = "John Doe"; lfs.enable = true; + delta = { + enable = true; + options = [ "--dark" ]; + }; } { |