tools: Add git utility scripts.

This commit is contained in:
derAnfaenger 2017-09-08 10:41:25 +02:00 committed by Tim Abbott
parent d05e932968
commit ea105ffec5
7 changed files with 242 additions and 0 deletions

43
tools/deploy-branch Normal file
View file

@ -0,0 +1,43 @@
#!/bin/bash
function error_out {
echo -en '\e[0;31m'
echo "$1"
echo -en '\e[0m'
exit 1
}
status=$(git status --porcelain | grep -v '^??')
[ ! -z "$status" ] && error_out "Working directory or index not clean"
old_ref=$(git rev-list --max-count=1 HEAD)
branch=$1
branch_ref=$(git rev-list --max-count=1 "$branch")
[ $? -ne 0 ] && error_out "Unknown branch: $branch"
if [ "$old_ref" == "$branch_ref" ]; then
new_ref=master
else
ref_name=$(git describe --all --exact "$old_ref")
if [ $? -eq 0 ]; then
new_ref=$(echo "$ref_name" | perl -pe 's{^(heads|remotes)/}{}')
else
new_ref=$old_ref
fi
fi
[ -z "$branch" ] && error_out "You must specify a branch name to deploy"
git fetch -p
git rebase origin/master "$branch"
[ $? -ne 0 ] && error_out "Rebase onto origin/master failed"
git push . HEAD:master
git push origin master
[ $? -ne 0 ] && error_out "Push of master to origin/master failed"
git checkout "$new_ref"
git branch -D "$branch"
git push origin ":$branch"