diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-19 15:34:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-19 15:34:16 -0700 |
| commit | d05d0e99665ecb67c3e8b9b3be40b12e9052a8b8 (patch) | |
| tree | c4ed27f64e3b43de4b0ae9c63b43ea6e201e7c9f /run-command.c | |
| parent | 331f06d6f1cc0e164c4aa320c2659d99de67f2f6 (diff) | |
| parent | 9445b4921e3e996b2d38d58c594f95d63a72dcea (diff) | |
| download | git-d05d0e99665ecb67c3e8b9b3be40b12e9052a8b8.tar.gz | |
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
Diffstat (limited to 'run-command.c')
| -rw-r--r-- | run-command.c | 5 |
1 files changed, 1 insertions, 4 deletions
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; |