diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-08-20 01:34:16 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-20 01:34:16 +0300 |
commit | d05d0e99665ecb67c3e8b9b3be40b12e9052a8b8 (patch) | |
tree | c4ed27f64e3b43de4b0ae9c63b43ea6e201e7c9f | |
parent | 331f06d6f1cc0e164c4aa320c2659d99de67f2f6 (diff) | |
parent | 9445b4921e3e996b2d38d58c594f95d63a72dcea (diff) |
Merge branch 'ab/hooks'
"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
-rw-r--r-- | path.c | 2 | ||||
-rw-r--r-- | run-command.c | 5 | ||||
-rwxr-xr-x | t/t1350-config-hooks-path.sh | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -380,6 +380,8 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len) get_index_file(), strlen(get_index_file())); else if (git_db_env && dir_prefix(base, "objects")) 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) update_common_dir(buf, git_dir_len, NULL); } diff --git a/run-command.c b/run-command.c index 33bc63a1de..5a4dbb66d7 100644 --- a/run-command.c +++ b/run-command.c @@ -824,10 +824,7 @@ const char *find_hook(const char *name) static struct strbuf path = STRBUF_INIT; 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) return NULL; return path.buf; diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh index 5e3fb3a6af..f1f9aee9f5 100755 --- a/t/t1350-config-hooks-path.sh +++ b/t/t1350-config-hooks-path.sh @@ -34,4 +34,10 @@ test_expect_success 'Check that various forms of specifying core.hooksPath work' 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 |