summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Ben Walton <bwalton@artsci.utoronto.ca>2010-03-20 10:48:08 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-20 09:03:52 -0700
commit502be959531b34e2d9283213b7bca51842639240 (patch)
treedfa1e75d548773be3c947021cbb7bbabb070a3e5 /builtin/merge.c
parentMerge branch 'maint' (diff)
downloadtgif-502be959531b34e2d9283213b7bca51842639240.tar.xz
Make templates honour SHELL_PATH and PERL_PATH
The hook script templates were hard coded to use /bin/sh and perl. This patch ensures that they use the same tools specified for the rest of the suite. The impetus for the change was noticing that, as shipped, some of the hooks used shell constructs that wouldn't work under Solaris' /bin/sh (eg: $(cmd...) substitutions). Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions