debian-mirror-gitlab/.lefthook/pre-push/merge_conflicts
2023-03-04 22:38:38 +05:30

23 lines
610 B
Bash
Executable file

#!/bin/bash
# Adjusted from https://gitlab.com/fdegier/pre-push-hooks with hardcoded values for speed
ORIGIN=origin
DEFAULT_BRANCH=master
if [[ -n "$ORIGIN" ]]
then
# Pull the default branch from remote
git fetch --quiet origin "$DEFAULT_BRANCH":"$DEFAULT_BRANCH"
fi
# Check for merge conflicts and abort
if git merge --autostash --no-commit --no-ff --no-edit "$DEFAULT_BRANCH" > /dev/null 2>&1
then
# Able to merge without conflicts
git merge --abort > /dev/null 2>&1
exit 0
else
echo "Merge conflicts detected when merging to $DEFAULT_BRANCH!"
git merge --abort > /dev/null 2>&1
exit 1
fi