diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-06 07:55:02 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-06 07:55:02 +0800 |
| commit | 96f9fe6514a2139373c50e19a77fd217ef62e6ef (patch) | |
| tree | 8227f00dfe25e470b9ef5bfaf12a250e457cd4f8 /build-aux | |
| parent | 0fbe79727b07879cb4f0a5cb8d7288353c082bd0 (diff) | |
| parent | 1ef219e220c9645a5592eb73837aba8d50e4265c (diff) | |
| download | emacs-96f9fe6514a2139373c50e19a77fd217ef62e6ef.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, 4 insertions, 4 deletions
diff --git a/build-aux/git-hooks/post-commit b/build-aux/git-hooks/post-commit index 10f43b539ac..e02fee48db4 100755 --- a/build-aux/git-hooks/post-commit +++ b/build-aux/git-hooks/post-commit @@ -34,7 +34,7 @@ ### Code: -HOOKS_DIR=$(dirname $0) +HOOKS_DIR=`dirname "$0"` # Prefer gawk if available, as it handles NUL bytes properly. if type gawk >/dev/null 2>&1; then @@ -44,4 +44,4 @@ else fi git rev-parse HEAD | $awk -v reason=post-commit \ - -f $HOOKS_DIR/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 8d5dde2bbaf..a342814c1e3 100755 --- a/build-aux/git-hooks/pre-push +++ b/build-aux/git-hooks/pre-push @@ -31,7 +31,7 @@ ### Code: -HOOKS_DIR=$(dirname $0) +HOOKS_DIR=`dirname "$0"` # Prefer gawk if available, as it handles NUL bytes properly. if type gawk >/dev/null 2>&1; then @@ -85,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 $HOOKS_DIR/commit-msg-files.awk +' | $awk -v reason=pre-push -f "$HOOKS_DIR"/commit-msg-files.awk |