Merge commit '9b1b55ba0264a55add4b7b4e022bdc2832b531f6'

1 files changed, 17 insertions, 2 deletions

diff --git a/home-manager/tests/modules/programs/git/git.nix b/home-manager/tests/modules/programs/git/git.nix
index 7c0bf52de55..feefff54b61 100644
--- a/home-manager/tests/modules/programs/git/git.nix
+++ b/home-manager/tests/modules/programs/git/git.nix
@@ -15,8 +15,10 @@ let
     pkgs.substituteAll {
       src = path;
 
-      git_include_path =
-        pkgs.writeText "contents" (generators.toINI { } gitInclude);
+      deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
+
+      git_include_path = pkgs.writeText "contents"
+        (builtins.readFile ./git-expected-include.conf);
     };
 
 in {
@@ -28,6 +30,7 @@ in {
         aliases = {
           a1 = "foo";
           a2 = "bar";
+          escapes = ''"\n	'';
         };
         extraConfig = {
           extra = {
@@ -55,6 +58,18 @@ in {
         userEmail = "user@example.org";
         userName = "John Doe";
         lfs.enable = true;
+        delta = {
+          enable = true;
+          options = {
+            features = "decorations";
+            whitespace-error-style = "22 reverse";
+            decorations = {
+              commit-decoration-style = "bold yellow box ul";
+              file-style = "bold yellow ul";
+              file-decoration-style = "none";
+            };
+          };
+        };
       }
 
       {