remove dependencies
This commit is contained in:
parent
01d39f31dd
commit
d326c45572
|
@ -9,11 +9,18 @@ set -o errtrace -o errexit -o nounset -o pipefail
|
||||||
|
|
||||||
# HELP: git pull, pull subtrees, and push back to spiff-arena origin
|
# HELP: git pull, pull subtrees, and push back to spiff-arena origin
|
||||||
|
|
||||||
if has_local_git_changes; then
|
if ! grep -q 'working tree clean' <<<"$(git status)"; then
|
||||||
>&2 echo "ERROR: you have local git changes. Please commit or stash them before running this script."
|
>&2 echo "ERROR: you have local git changes. Please commit or stash them before running this script."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
gp
|
branchname=$(git symbolic-ref HEAD | cut -d'/' -f3,4)
|
||||||
|
|
||||||
|
if [[ "$branchname" != "main" ]]; then
|
||||||
|
>&2 echo "ERROR: run this thing from the main branch, not $branchname"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
git pull
|
||||||
./bin/pull-subtrees
|
./bin/pull-subtrees
|
||||||
gpush
|
git push origin main
|
||||||
|
|
Loading…
Reference in New Issue