From 4f336803ab33a014b32a7968124d17aa71144771 Mon Sep 17 00:00:00 2001 From: Michael Mandl Date: Fri, 11 Apr 2025 10:26:22 +0200 Subject: [PATCH] feat(git): enable relative worktrees --- git/default.nix | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/git/default.nix b/git/default.nix index 5248c25..3f39a34 100644 --- a/git/default.nix +++ b/git/default.nix @@ -105,7 +105,10 @@ tag.sort = "version:refname"; - worktree.guessRemote = true; + worktree = { + guessRemote = true; + useRelativePaths = true; + }; }; aliases = { @@ -144,26 +147,5 @@ git -C ''${dir}/.base checkout --detach HEAD git -C ''${dir}/.base worktree add ../''${branch} '') - - (writeShellScriptBin "git-make-relative" '' - - gitfile=''${1} - - if [[ -z ''${gitfile} ]]; then - gitfile=".git" - fi - - if [[ ! -f ''${gitfile} ]]; then - echo "file ''${gitfile} does not exist" - exit 1 - fi - - gitdir=$(grep "gitdir:" ''${gitfile} | cut -d: -f2 | xargs) - rel_gitdir=$(realpath -s --relative-to=. ''${gitdir}) - - echo "relative path: ''${rel_gitdir}" - - sed -i -e "s,gitdir:.*,gitdir: ''${rel_gitdir}," ''${gitfile} - '') ]; }