From 9389d1d2840901afd0fa7e4c308b95dd188bc025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sun, 6 Oct 2024 22:02:00 +0200 Subject: [PATCH] git-sync: Use proper thing --- hm/git/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hm/git/default.nix b/hm/git/default.nix index b61db02..9d2ed7a 100644 --- a/hm/git/default.nix +++ b/hm/git/default.nix @@ -19,10 +19,10 @@ in cd "${r.path}" if [ -d .jj ] then - jj git fetch - jj rebase -d main@origin - jj branch set main -r @- - jj git push + ${lib.getExe pkgs.jujutsu} git fetch + ${lib.getExe pkgs.jujutsu} rebase -d main@origin + ${lib.getExe pkgs.jujutsu} branch set main -r @- + ${lib.getExe pkgs.jujutsu} git push else ${pkgs.git}/bin/git --no-optional-locks diff --quiet || echo "Repository is dirty!" ${pkgs.git}/bin/git pull || true