fix: only pre hook failure triggers procedure to stop

Author: gaojunran

docs/cn/hooks.md

@@ -57,6 +57,10 @@ lint:
 
 你可以参阅 [just 手册](https://just.systems/man/en/introduction.html) 来查看更多高级功能。
 
+## 失败的命令
+
+对于 `pre` 钩子，如果钩子命令失败，hj 会阻止版本控制命令的执行。
+
 ## 与 Git 的兼容性
 
 我们提供了运行 Git Hooks 相关的功能。在特定时期，hj 会自动运行：

justfile

@@ -29,6 +29,9 @@ test:
 install:
   cargo install --path .
 
+post-commit: 
+  just --quiet install
+
 doc:
   cd docs && pnpm install && pnpm run docs:dev
 

src/hook.rs

@@ -8,24 +8,44 @@ pub(crate) fn check_just_installed() -> bool {
     cmd!("just", "--version").run().is_ok()
 }
 
-pub(crate) fn run_hook(config: &AppConfig, script: String, hook_name: &str) -> anyhow::Result<()> {
+pub(crate) fn run_hook(
+    config: &AppConfig,
+    script: String,
+    hook_name: &str,
+) -> anyhow::Result<bool> {
     if config.hooks.use_just && !check_just_installed() {
         step("Install just to run hooks");
         // TODO: provide installation instructions
     }
+
+    // Run git hook
     if Path::new(&format!(".git/hooks/{hook_name}")).exists()
         && !config
             .hooks
             .ignore_git_hooks
             .contains(&hook_name.to_string())
     {
         step(&format!("Running {hook_name} hook"));
-        cmd!("git", "hook", "run", hook_name).run()?;
+        if let Err(e) = cmd!("git", "hook", "run", hook_name).run()
+            && hook_name.starts_with("pre-")
+        {
+            anyhow::bail!(
+                "Git {} hook failed: {}. Aborting.",
+                hook_name,
+                e.to_string()
+            )
+        }
     }
+
+    // Run hj hook
     let (program, args): (&str, Vec<&str>) = script
         .split_once(' ')
         .map(|(p, a)| (p, a.trim().split(' ').collect()))
         .unwrap_or((&script, Vec::new()));
-    cmd(program, &args).run()?;
-    Ok(())
+    if let Err(e) = cmd(program, &args).run()
+        && hook_name.starts_with("pre-")
+    {
+        anyhow::bail!("HJ {} hook failed: {}. Aborting.", hook_name, e.to_string());
+    }
+    Ok(true)
 }