repo: add path.hooks with absolute and relative suffixes
Hooks are an integral part of a repository's configuration and are commonly used by tooling to automate repository-specific workflows. Currently, scripts typically retrieve the hooks directory by invoking `git rev-parse --git-path hooks`. Introduce `path.hooks.absolute` and `path.hooks.relative` keys to `git repo info`. This exposes the hooks directory as a scriptable config-like key using standard format rules, allowing scripts to retrieve it through the same interface as other repository path information. Mentored-by: Justin Tobler <jltobler@gmail.com> Mentored-by: Lucas Seiki Oshiro <lucasseikioshiro@gmail.com> Signed-off-by: K Jayatheerth <jayatheerthkulkarni2005@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>seen
parent
46e43fb11a
commit
fe820ac1fc
|
|
@ -119,6 +119,15 @@ values that they return:
|
|||
`path.gitdir.relative`::
|
||||
The path to the Git repository directory relative to the current working directory.
|
||||
|
||||
`path.hooks.absolute`::
|
||||
The canonical absolute path to the repository's hooks directory.
|
||||
Respects the `core.hooksPath` configuration. If `core.hooksPath` is
|
||||
set to `/dev/null`, that value is returned unchanged.
|
||||
|
||||
`path.hooks.relative`::
|
||||
The path to the repository's hooks directory relative to the current
|
||||
working directory. Respects the `core.hooksPath` configuration.
|
||||
|
||||
`path.superproject-root.absolute`::
|
||||
The canonical absolute path to the working tree root of the superproject
|
||||
if the current repository is an initialized submodule. Outputs an empty
|
||||
|
|
|
|||
|
|
@ -122,6 +122,26 @@ static int get_path_gitdir_relative(struct repository *repo, struct strbuf *buf)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int get_path_hooks_absolute(struct repository *repo, struct strbuf *buf)
|
||||
{
|
||||
struct strbuf hooks_path = STRBUF_INIT;
|
||||
|
||||
repo_git_path_replace(repo, &hooks_path, "hooks");
|
||||
format_path(buf, hooks_path.buf, "", PATH_FORMAT_CANONICAL);
|
||||
strbuf_release(&hooks_path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int get_path_hooks_relative(struct repository *repo, struct strbuf *buf)
|
||||
{
|
||||
struct strbuf hooks_path = STRBUF_INIT;
|
||||
|
||||
repo_git_path_replace(repo, &hooks_path, "hooks");
|
||||
format_path(buf, hooks_path.buf, repo->prefix, PATH_FORMAT_RELATIVE);
|
||||
strbuf_release(&hooks_path);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int get_path_superproject_absolute(struct repository *repo UNUSED, struct strbuf *buf)
|
||||
{
|
||||
struct strbuf superproject = STRBUF_INIT;
|
||||
|
|
@ -188,6 +208,8 @@ static const struct repo_info_field repo_info_field[] = {
|
|||
{ "path.commondir.relative", get_path_commondir_relative },
|
||||
{ "path.gitdir.absolute", get_path_gitdir_absolute },
|
||||
{ "path.gitdir.relative", get_path_gitdir_relative },
|
||||
{ "path.hooks.absolute", get_path_hooks_absolute },
|
||||
{ "path.hooks.relative", get_path_hooks_relative },
|
||||
{ "path.superproject-root.absolute", get_path_superproject_absolute },
|
||||
{ "path.superproject-root.relative", get_path_superproject_relative },
|
||||
{ "path.toplevel.absolute", get_path_toplevel_absolute },
|
||||
|
|
|
|||
|
|
@ -174,7 +174,11 @@ test_repo_info_path () {
|
|||
cd repo/sub &&
|
||||
ROOT="$(test-tool path-utils real_path ..)" && export ROOT &&
|
||||
eval "$init_command" &&
|
||||
echo "path.$field_name.absolute=$ROOT/$expected_dir" >expect &&
|
||||
case "$expected_dir" in
|
||||
/*) EXPECT_ABS="$expected_dir" ;;
|
||||
*) EXPECT_ABS="$ROOT/$expected_dir" ;;
|
||||
esac &&
|
||||
echo "path.$field_name.absolute=$EXPECT_ABS" >expect &&
|
||||
git repo info "path.$field_name.absolute" >actual &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
|
|
@ -188,7 +192,11 @@ test_repo_info_path () {
|
|||
cd repo/sub &&
|
||||
ROOT="$(test-tool path-utils real_path ..)" && export ROOT &&
|
||||
eval "$init_command" &&
|
||||
echo "path.$field_name.relative=../$expected_dir" >expect &&
|
||||
case "$expected_dir" in
|
||||
/*) EXPECT_REL="$(test-tool path-utils relative_path "$expected_dir" "$PWD")" ;;
|
||||
*) EXPECT_REL="../$expected_dir" ;;
|
||||
esac &&
|
||||
echo "path.$field_name.relative=$EXPECT_REL" >expect &&
|
||||
git repo info "path.$field_name.relative" >actual &&
|
||||
test_cmp expect actual
|
||||
)
|
||||
|
|
@ -213,6 +221,22 @@ test_repo_info_path 'gitdir with explicit GIT_DIR' 'gitdir' \
|
|||
'.git' \
|
||||
'GIT_DIR="../.git" && export GIT_DIR'
|
||||
|
||||
test_repo_info_path 'hooks standard' 'hooks' '.git/hooks'
|
||||
|
||||
test_repo_info_path 'hooks with core.hooksPath override' 'hooks' \
|
||||
'custom-hooks' \
|
||||
'git config core.hooksPath "$ROOT/custom-hooks" && mkdir -p "$ROOT/custom-hooks"'
|
||||
|
||||
# /dev/null is not a real, canonicalizable filesystem path on Windows,
|
||||
# so path resolution for core.hooksPath=/dev/null cannot be expected to
|
||||
# produce a literal "/dev/null" the way it does on POSIX systems.
|
||||
if ! test_have_prereq MINGW
|
||||
then
|
||||
test_repo_info_path 'hooks with core.hooksPath=/dev/null' 'hooks' \
|
||||
'/dev/null' \
|
||||
'git config core.hooksPath /dev/null'
|
||||
fi
|
||||
|
||||
test_expect_success 'path.superproject-root absolute and relative' '
|
||||
test_when_finished "rm -rf sub super" &&
|
||||
git init sub &&
|
||||
|
|
|
|||
Loading…
Reference in New Issue