Resolve core.hooksPath relative to GIT_WORK_TREE

git supports relative values in core.hooksPath.

`man git-config`:

> A relative path is taken as relative to the directory where the hooks are
> run (see the "DESCRIPTION" section of githooks[5]).

`man githooks`:

> Before Git invokes a hook, it changes its working directory to either
> $GIT_DIR in a bare repository or the root of the working tree in a >
> non-bare repository.

I.e. relative paths in core.hooksPath in non-bare repositories are always
relative to GIT_WORK_TREE.

There is a further exception; I believe this is not considered for path
resolution:

> An exception are hooks triggered during a push (pre-receive, update,
> post-receive, post-update, push-to-checkout) which are always executed
> in $GIT_DIR.

Author: Naseschwarz

CHANGELOG.md

@@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * push: respect `branch.*.merge` when push default is upstream [[@vlad-anger](https://github.com/vlad-anger)] ([#2542](https://github.com/gitui-org/gitui/pull/2542))
 * set the terminal title to `gitui ({repo_path})` [[@acuteenvy](https://github.com/acuteenvy)] ([#2462](https://github.com/gitui-org/gitui/issues/2462))
 
+### Fixes
+*  Resolve core.hooksPath relative to `GIT_WORK_TREE` [[@naseschwarz](https://github.com/naseschwarz)] ([#2571](https://github.com/gitui-org/gitui/issues/2571))
+
 ## [0.27.0] - 2024-01-14
 
 **new: manage remotes**

asyncgit/src/sync/hooks.rs

@@ -174,4 +174,40 @@ mod tests {
 
 		assert_eq!(msg, String::from("msg\n"));
 	}
+
+	#[test]
+	fn test_hooks_commit_msg_reject_in_hooks_folder_githooks_moved_absolute(
+	) {
+		let (_td, repo) = repo_init().unwrap();
+		let root = repo.path().parent().unwrap();
+		let mut config = repo.config().unwrap();
+
+		const HOOKS_DIR: &'static str = "my_hooks";
+		config.set_str("core.hooksPath", HOOKS_DIR).unwrap();
+
+		let hook = b"#!/bin/sh
+	echo 'msg' > $1
+	echo 'rejected'
+	exit 1
+	        ";
+		let hooks_folder = root.join(HOOKS_DIR);
+		std::fs::create_dir_all(&hooks_folder).unwrap();
+		git2_hooks::create_hook_in_path(
+			&hooks_folder.join("commit-msg"),
+			hook,
+		);
+
+		let mut msg = String::from("test");
+		let res = hooks_commit_msg(
+			&hooks_folder.to_str().unwrap().into(),
+			&mut msg,
+		)
+		.unwrap();
+		assert_eq!(
+			res,
+			HookResult::NotOk(String::from("rejected\n"))
+		);
+
+		assert_eq!(msg, String::from("msg\n"));
+	}
 }

git2-hooks/src/hookspath.rs

@@ -49,8 +49,17 @@ impl HookPaths {
 					.ok_or(HooksError::PathToString)?,
 			)?;
 
-			let hook = PathBuf::from_str(hook.as_ref())
-				.map_err(|_| HooksError::PathToString)?;
+			let hook = {
+				let hook_expanded = PathBuf::from_str(hook.as_ref())
+					.map_err(|_| HooksError::PathToString)?;
+				if hook_expanded.is_absolute() {
+					hook_expanded
+				} else {
+					let mut hook_absolute = pwd.clone();
+					hook_absolute.push(hook_expanded);
+					hook_absolute
+				}
+			};
 
 			return Ok(Self {
 				git: git_dir,

git2-hooks/src/lib.rs

@@ -98,7 +98,11 @@ pub fn create_hook(
 	path
 }
 
-fn create_hook_in_path(path: &Path, hook_script: &[u8]) {
+/// helper method to create a git hook in a custom path (used in unittests)
+///
+/// # Panics
+/// Panics if hook could not be created
+pub fn create_hook_in_path(path: &Path, hook_script: &[u8]) {
 	File::create(path).unwrap().write_all(hook_script).unwrap();
 
 	#[cfg(unix)]