undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/hooks'

Browse Source 
"git rev-parse --git-path hooks/<hook>" learned to take
core.hooksPath configuration variable (introduced during 2.9 cycle)
into account.

* ab/hooks:
  rev-parse: respect core.hooksPath in --git-path
This commit is contained in:
Junio C Hamano 2016-08-19 15:34:16 -07:00
commit d05d0e9966
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
path.c
View File

@ -380,6 +380,8 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)
get_index_file(), strlen(get_index_file())); get_index_file(), strlen(get_index_file()));
else if (git_db_env && dir_prefix(base, "objects")) else if (git_db_env && dir_prefix(base, "objects"))
replace_dir(buf, git_dir_len + 7, get_object_directory()); replace_dir(buf, git_dir_len + 7, get_object_directory());
else if (git_hooks_path && dir_prefix(base, "hooks"))
replace_dir(buf, git_dir_len + 5, git_hooks_path);
else if (git_common_dir_env) else if (git_common_dir_env)
update_common_dir(buf, git_dir_len, NULL); update_common_dir(buf, git_dir_len, NULL);
} }

3
run-command.c
View File

@ -824,9 +824,6 @@ const char *find_hook(const char *name)
static struct strbuf path = STRBUF_INIT; static struct strbuf path = STRBUF_INIT;
strbuf_reset(&path); strbuf_reset(&path);
if (git_hooks_path)
strbuf_addf(&path, "%s/%s", git_hooks_path, name);
else
strbuf_git_path(&path, "hooks/%s", name); strbuf_git_path(&path, "hooks/%s", name);
if (access(path.buf, X_OK) < 0) if (access(path.buf, X_OK) < 0)
return NULL; return NULL;

6
t/t1350-config-hooks-path.sh
View File

@ -34,4 +34,10 @@ test_expect_success 'Check that various forms of specifying core.hooksPath work'
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'git rev-parse --git-path hooks' '
git config core.hooksPath .git/custom-hooks &&
git rev-parse --git-path hooks/abc >actual &&
test .git/custom-hooks/abc = "$(cat actual)"
'
test_done test_done