diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:40 -0700 |
| commit | 0cb050abc2e7f05894f9f79d5330ce4559653af6 (patch) | |
| tree | ef2ead44c562b088c1d18b2dbdde880f5a78ffc9 /templates/hooks--prepare-commit-msg.sample | |
| parent | 59d1e01d69865cb2238e01102c6987e4e1d71a32 (diff) | |
| parent | 100e762a60a691a4978434f1cd5532e19cad39fc (diff) | |
| download | git-0cb050abc2e7f05894f9f79d5330ce4559653af6.tar.gz | |
Merge branch 'bw/template-tool-buildconfig'
* bw/template-tool-buildconfig:
Modernize git calling conventions in hook templates
Make templates honour SHELL_PATH and PERL_PATH
Diffstat (limited to 'templates/hooks--prepare-commit-msg.sample')
| -rwxr-xr-x | templates/hooks--prepare-commit-msg.sample | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/hooks--prepare-commit-msg.sample b/templates/hooks--prepare-commit-msg.sample index 365242499d..86b8f227ec 100755 --- a/templates/hooks--prepare-commit-msg.sample +++ b/templates/hooks--prepare-commit-msg.sample @@ -1,7 +1,7 @@ #!/bin/sh # # An example hook script to prepare the commit log message. -# Called by git-commit with the name of the file that has the +# Called by "git commit" with the name of the file that has the # commit message, followed by the description of the commit # message's source. The hook's purpose is to edit the commit # message file. If the hook fails with a non-zero status, @@ -22,10 +22,10 @@ case "$2,$3" in merge,) - perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + @PERL_PATH@ -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; # ,|template,) -# perl -i.bak -pe ' +# @PERL_PATH@ -i.bak -pe ' # print "\n" . `git diff --cached --name-status -r` # if /^#/ && $first++ == 0' "$1" ;; |