1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00

Merge remote-tracking branch 'origin/master' into feature/android

This commit is contained in:
Po Lu 2023-05-05 08:27:30 +08:00
commit daccdf7e6d
7 changed files with 68 additions and 50 deletions

View file

@ -34,6 +34,8 @@
### Code:
HOOKS_DIR=$(dirname $0)
# Prefer gawk if available, as it handles NUL bytes properly.
if type gawk >/dev/null 2>&1; then
awk="gawk"
@ -42,4 +44,4 @@ else
fi
git rev-parse HEAD | $awk -v reason=post-commit \
-f ${GIT_DIR:-.git}/hooks/commit-msg-files.awk
-f $HOOKS_DIR/commit-msg-files.awk

View file

@ -31,6 +31,8 @@
### Code:
HOOKS_DIR=$(dirname $0)
# Prefer gawk if available, as it handles NUL bytes properly.
if type gawk >/dev/null 2>&1; then
awk="gawk"
@ -83,4 +85,4 @@ $awk -v origin_name="$1" '
# Print every SHA after oldref, up to (and including) newref.
system("git rev-list --first-parent --reverse " oldref ".." newref)
}
' | $awk -v reason=pre-push -f ${GIT_DIR:-.git}/hooks/commit-msg-files.awk
' | $awk -v reason=pre-push -f $HOOKS_DIR/commit-msg-files.awk