diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-02 08:09:17 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-02 08:09:17 +0800 |
| commit | 86b7ed619c7d7da035915b8c75b427ed66801123 (patch) | |
| tree | 6b0dfd2d772702eedcb6893a5e64df6a17ea32bf /build-aux | |
| parent | f92bdbc67754c77afcae95cb1ab237e2c5053ab2 (diff) | |
| parent | 7d246c359cf3d25cab5134076e393c4d25015827 (diff) | |
| download | emacs-86b7ed619c7d7da035915b8c75b427ed66801123.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 | 2 | ||||
| -rwxr-xr-x | build-aux/git-hooks/pre-push | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build-aux/git-hooks/post-commit b/build-aux/git-hooks/post-commit index 68d9995d915..05f2d778b5c 100755 --- a/build-aux/git-hooks/post-commit +++ b/build-aux/git-hooks/post-commit @@ -42,4 +42,4 @@ else fi git rev-parse HEAD | $awk -v reason=post-commit \ - -f .git/hooks/commit-msg-files.awk + -f ${GIT_DIR:-.git}/hooks/commit-msg-files.awk diff --git a/build-aux/git-hooks/pre-push b/build-aux/git-hooks/pre-push index 8e8277cba4f..6ff59102fd7 100755 --- a/build-aux/git-hooks/pre-push +++ b/build-aux/git-hooks/pre-push @@ -83,4 +83,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/hooks/commit-msg-files.awk +' | $awk -v reason=pre-push -f ${GIT_DIR:-.git}/hooks/commit-msg-files.awk |