-
Notifications
You must be signed in to change notification settings - Fork 10.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix bin/post-merge.sh & bin/pre-push.sh
- Loading branch information
Showing
3 changed files
with
20 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #!/bin/sh | ||
| . "$(dirname "$0")/_/husky.sh" | ||
|
|
||
| ./bin/post-push.sh | ||
| ./bin/pre-push.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,24 @@ | ||
| #!/bin/sh | ||
|
|
||
| PROTECTED_BRANCH="trunk" | ||
| REMOTE_REF=$(echo "$HUSKY_GIT_STDIN" | cut -d " " -f 3) | ||
|
|
||
| if [ -n "$REMOTE_REF" ]; then | ||
| if [ "refs/heads/${PROTECTED_BRANCH}" = "$REMOTE_REF" ]; then | ||
| if [ "$TERM" = "dumb" ]; then | ||
| >&2 echo "Sorry, you are unable to push to trunk using a GUI client! Please use git CLI." | ||
| exit 1 | ||
| fi | ||
|
|
||
| printf "%sYou're about to push to trunk, is that what you intended? [y/N]: %s" "$(tput setaf 3)" "$(tput sgr0)" | ||
| read -r PROCEED < /dev/tty | ||
| echo | ||
| CURRENT_BRANCH=$(git branch --show-current) | ||
| if [ $PROTECTED_BRANCH = $CURRENT_BRANCH ]; then | ||
| if [ "$TERM" = "dumb" ]; then | ||
| >&2 echo "Sorry, you are unable to push to $PROTECTED_BRANCH using a GUI client! Please use git CLI." | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ "$(echo "${PROCEED:-n}" | tr "[:upper:]" "[:lower:]")" = "y" ]; then | ||
| echo "$(tput setaf 2)Brace yourself! Pushing to the trunk branch...$(tput sgr0)" | ||
| echo | ||
| exit 0 | ||
| fi | ||
| printf "%sYou're about to push to $PROTECTED_BRANCH, is that what you intended? [y/N]: %s" "$(tput setaf 3)" "$(tput sgr0)" | ||
| read -r PROCEED < /dev/tty | ||
| echo | ||
|
|
||
| echo "$(tput setaf 2)Push to trunk cancelled!$(tput sgr0)" | ||
| if [ "$(echo "${PROCEED:-n}" | tr "[:upper:]" "[:lower:]")" = "y" ]; then | ||
| echo "$(tput setaf 2)Brace yourself! Pushing to the $PROTECTED_BRANCH branch...$(tput sgr0)" | ||
| echo | ||
| exit 1 | ||
| exit 0 | ||
| fi | ||
|
|
||
| echo "$(tput setaf 2)Push to $PROTECTED_BRANCH cancelled!$(tput sgr0)" | ||
| echo | ||
| exit 1 | ||
| fi |