Update git hooks with upstream fixes (#4690)

* Make git hooks work in git worktrees (#40038)

Make hooks work in worktrees and cleanup hooks

(cherry picked from commit d3731395b6)

* Replace all usages of /bin/bash shebang with /usr/bin/env (#40756)

Replace all usages of /bin/bash with /usr/bin/env

/usr/bin/env is nearly guaranteed to always exist at that location, which can't be said about /bin/bash and /bin/sh.

Co-authored-by: opl <4833621+opl@users.noreply.github.com>
(cherry picked from commit b9254d9ebf)

---------

Co-authored-by: War Pigeon <54217755+minus1over12@users.noreply.github.com>
Co-authored-by: opl- <opl-@users.noreply.github.com>
Co-authored-by: opl <4833621+opl@users.noreply.github.com>
This commit is contained in:
Tobias Berger
2025-11-19 07:48:01 -06:00
committed by GitHub
co-authored by War Pigeon opl- opl
parent ed50f7cb60
commit e53ffd0536
9 changed files with 31 additions and 33 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
# Add this to .git/config:
# [merge "mapping-merge-driver"]