admin/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-02-17 22:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Skip merge commits with hook

Browse Source
This commit is contained in:
Matt Bishop
2025-10-03 15:22:20 -04:00
parent 39fc6d292d
commit cdc22c72f6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.git-hooks/pre-commit
View File

@@ -1,5 +1,10 @@
#!/bin/sh
# Skip hook if this is a merge commit
if [ -f .git/MERGE_HEAD ]; then
exit 0
fi
FILES=$(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g')
[ -z "$FILES" ] && exit 0