Skip to content

Pc update #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sparks29032 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Pc update #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ce2d49
shebang fix for win, prevent error on ci merges
Sparks29032 May 30, 2024
d73843f
git fix
Sparks29032 May 30, 2024
9c45a51
Make explicit merge to master
Sparks29032 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions prevent_commit_to_main.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
#!/bin/sh
#!/usr/bin/env sh
##!"C:\\Program Files\\Git\\usr\\bin\\bash.exe"

branch="$(git rev-parse --abbrev-ref HEAD)"

if [ "$branch" = "main" ]; then
echo "You are on the main branch. Committing to the main branch is not allowed."
exit 1
if [ -z "${GIT_DIR}/MERGE_MODE" ]; then
echo "Merge to main allowed."
exit 0
else
echo "You are on the main branch. Committing to the main branch is not allowed."
exit 1
fi
fi