Do potentially destructive operations in prepare-commit-msg
* build-aux/git-hooks/prepare-commit-msg: If someone occasionally puts Signed-off line, it will likely get there through -s option of git. Exploit this fact to abort before a user got a chance to type commit message. (Bug#35368)
This commit is contained in:
parent
cf5457764c
commit
2bdc419f51
2 changed files with 46 additions and 1 deletions
|
@ -323,7 +323,7 @@ git_config diff.texinfo.xfuncname \
|
||||||
tailored_hooks=
|
tailored_hooks=
|
||||||
sample_hooks=
|
sample_hooks=
|
||||||
|
|
||||||
for hook in commit-msg pre-commit; do
|
for hook in commit-msg pre-commit prepare-commit-msg; do
|
||||||
cmp -- build-aux/git-hooks/$hook "$hooks/$hook" >/dev/null 2>&1 ||
|
cmp -- build-aux/git-hooks/$hook "$hooks/$hook" >/dev/null 2>&1 ||
|
||||||
tailored_hooks="$tailored_hooks $hook"
|
tailored_hooks="$tailored_hooks $hook"
|
||||||
done
|
done
|
||||||
|
|
45
build-aux/git-hooks/prepare-commit-msg
Executable file
45
build-aux/git-hooks/prepare-commit-msg
Executable file
|
@ -0,0 +1,45 @@
|
||||||
|
#!/bin/sh
|
||||||
|
# Check the format of GNU Emacs change log entries.
|
||||||
|
|
||||||
|
# Copyright 2019 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
# This file is part of GNU Emacs.
|
||||||
|
|
||||||
|
# GNU Emacs is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
|
||||||
|
# GNU Emacs is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
COMMIT_MSG_FILE=$1
|
||||||
|
COMMIT_SOURCE=$2
|
||||||
|
SHA1=$3
|
||||||
|
|
||||||
|
# Prefer gawk if available, as it handles NUL bytes properly.
|
||||||
|
if type gawk >/dev/null 2>&1; then
|
||||||
|
awk=gawk
|
||||||
|
else
|
||||||
|
awk=awk
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec $awk '
|
||||||
|
# Catch the case when someone ran git-commit with -s option,
|
||||||
|
# which automatically adds Signed-off-by.
|
||||||
|
/^Signed-off-by: / {
|
||||||
|
print "'\''Signed-off-by:'\'' in commit message"
|
||||||
|
status = 1
|
||||||
|
}
|
||||||
|
END {
|
||||||
|
if (status != 0) {
|
||||||
|
print "Commit aborted; please see the file 'CONTRIBUTE'"
|
||||||
|
}
|
||||||
|
exit status
|
||||||
|
}
|
||||||
|
' <"$COMMIT_MSG_FILE"
|
Loading…
Add table
Reference in a new issue