From 90ae850a6ddcd3bf7f94fb6f1e62ad55e2a67319 Mon Sep 17 00:00:00 2001
From: David Arnold <dgx.arnold@gmail.com>
Date: Mon, 26 Feb 2024 17:59:18 +0100
Subject: [PATCH] fix: apps cloner

---
 src/shell.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/shell.nix b/src/shell.nix
index ce86747..d95d957 100644
--- a/src/shell.nix
+++ b/src/shell.nix
@@ -178,9 +178,12 @@ in {
               text = let
                 clone = app: ''
                   if [[ ! -d "$PRJ_ROOT/apps/${app.pname}" ]]; then
-                    git clone --branch {app.src.src.rev} --origin upstream --branch custom --depth 1  ${app.src.src.gitRepoUrl} "$PRJ_ROOT/apps/${app.pname}"
+                    git clone --config "diff.fsjd.command=fsjd --git" --single-branch --branch "${app.src.src.rev}" \
+                      --origin upstream --depth 1 "${app.src.src.gitRepoUrl}" \
+                      "$PRJ_ROOT/apps/${app.pname}"
                     (
                       cd "$PRJ_ROOT/apps/${app.pname}";
+                      git switch -c custom
                       diff -uraN ${app.src} "$PRJ_ROOT/apps/${app.pname}" | patch
                       find . -type f -iname "*.orig" -delete
                       git add .