fix: backup in attributes init, validate hook names, --force overwrites gitignore, cargo check before install-delta

Author: JheisonMB

src/attributes/mod.rs

@@ -29,9 +29,16 @@ pub fn run(cmd: AttributesCommand) -> Result<()> {
     let root = find_repo_root()?;
     let path = root.join(".gitattributes");
 
-    if path.exists() && !force && !confirm(".gitattributes already exists. Overwrite?", yes) {
-        println!("Aborted.");
-        return Ok(());
+    if path.exists() && !force {
+        if !confirm(".gitattributes already exists. Overwrite?", yes) {
+            println!("Aborted.");
+            return Ok(());
+        }
+        if !dry_run {
+            let backup = root.join(".gitattributes.bak");
+            std::fs::copy(&path, &backup).context("Failed to backup .gitattributes")?;
+            println!("Backed up to {}", backup.display());
+        }
     }
 
     if dry_run {

src/config/mod.rs

@@ -122,6 +122,14 @@ fn delta_installed() -> bool {
 }
 
 fn install_delta() -> Result<()> {
+    anyhow::ensure!(
+        Command::new("cargo")
+            .arg("--version")
+            .output()
+            .map(|o| o.status.success())
+            .unwrap_or(false),
+        "cargo not found in PATH — install Rust from https://rustup.rs to install git-delta"
+    );
     println!("Installing git-delta...");
     let status = Command::new("cargo")
         .args(["install", "git-delta"])

src/hooks/mod.rs

@@ -61,7 +61,29 @@ fn hook_script(target: &str) -> String {
     format!("#!/bin/sh\nset -e\n{target}\n")
 }
 
+const VALID_HOOKS: &[&str] = &[
+    "applypatch-msg",
+    "commit-msg",
+    "fsmonitor-watchman",
+    "post-update",
+    "pre-applypatch",
+    "pre-commit",
+    "pre-merge-commit",
+    "pre-push",
+    "pre-rebase",
+    "pre-receive",
+    "prepare-commit-msg",
+    "push-to-checkout",
+    "update",
+];
+
 fn init(hook: &str, target: &str, yes: bool, force: bool, dry_run: bool) -> Result<()> {
+    if !VALID_HOOKS.contains(&hook) {
+        anyhow::bail!(
+            "'{hook}' is not a valid git hook. Valid hooks: {}",
+            VALID_HOOKS.join(", ")
+        );
+    }
     let dir = hooks_dir()?;
     let path = dir.join(hook);
 

src/ignore/mod.rs

@@ -35,12 +35,16 @@ pub fn run(cmd: IgnoreCommand) -> Result<()> {
     }
 }
 
-fn add(templates: &str, _yes: bool, _force: bool, dry_run: bool) -> Result<()> {
+fn add(templates: &str, _yes: bool, force: bool, dry_run: bool) -> Result<()> {
     let root = find_repo_root()?;
     let path = root.join(".gitignore");
 
     let new_content = resolve_templates(templates)?;
-    let merged = merge_gitignore(&path, &new_content);
+    let merged = if force {
+        new_content.clone()
+    } else {
+        merge_gitignore(&path, &new_content)
+    };
 
     if dry_run {
         println!("[dry-run] Would write .gitignore:\n{merged}");
@@ -80,6 +84,12 @@ fn resolve_templates(templates: &str) -> Result<String> {
             .context("Failed to fetch gitignore templates")?
             .into_string()
             .context("Failed to read response")?;
+        if fetched.trim().is_empty() {
+            anyhow::bail!(
+                "No templates found for: {}. Run 'gitkit ignore list' to see available templates.",
+                joined
+            );
+        }
         output.push_str(&fetched);
     }