diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-05 08:27:30 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-05 08:27:30 +0800 |
| commit | daccdf7e6d4bc42ffe8ffbc9db137bd44b073343 (patch) | |
| tree | eb0768a48d25a1bd7fdfaed69bbfcd78fa8efd00 /build-aux | |
| parent | ccef1ff072ef0eaac085aeffc7321dcf1fae2f0f (diff) | |
| parent | 34ac7d908762663e4f91b678d3456286c494c237 (diff) | |
| download | emacs-daccdf7e6d4bc42ffe8ffbc9db137bd44b073343.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/git-hooks/post-commit | 4 | ||||
| -rwxr-xr-x | build-aux/git-hooks/pre-push | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build-aux/git-hooks/post-commit b/build-aux/git-hooks/post-commit index 05f2d778b5c..10f43b539ac 100755 --- a/build-aux/git-hooks/post-commit +++ b/build-aux/git-hooks/post-commit @@ -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 diff --git a/build-aux/git-hooks/pre-push b/build-aux/git-hooks/pre-push index 6ff59102fd7..8d5dde2bbaf 100755 --- a/build-aux/git-hooks/pre-push +++ b/build-aux/git-hooks/pre-push @@ -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 |