From bf84a83a0087f53383a311beaf42a72c3d8230b0 Mon Sep 17 00:00:00 2001 From: Daniel Winkler Date: Thu, 28 Aug 2025 23:38:07 +1000 Subject: [PATCH] add flake files to git in any case --- templates/rde/flake.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/rde/flake.nix b/templates/rde/flake.nix index 53ed026..97f893e 100644 --- a/templates/rde/flake.nix +++ b/templates/rde/flake.nix @@ -161,10 +161,16 @@ # Initialize git if [[ ! -d ".git" ]]; then git init - git add flake.nix flake.lock echo "✓ Initialized Git repository and added: flake.nix, flake.lock" fi - + # Check if files are already staged/tracked before adding + if ! git diff --cached --name-only | grep -q "flake.nix\|flake.lock" && + ! git ls-files --error-unmatch flake.nix flake.lock >/dev/null 2>&1; then + echo "✓ Adding flake.nix, flake.lock to Git repository" + git add flake.nix flake.lock + else + echo "✓ flake.nix, flake.lock already tracked/staged in Git" + fi # Create .gitignore if [[ ! -f ".gitignore" ]]; then cat > .gitignore << 'EOF'