Adjust script to remove branches which are deleted on GitHub

Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Jan-Christoph Borchardt 2019-05-14 15:08:38 +02:00
parent 934924577a
commit bc61b15e2f
No known key found for this signature in database
GPG Key ID: CBD846FC845CBE17
2 changed files with 2 additions and 2 deletions

View File

@ -11,4 +11,4 @@
# - removes branches merged into master
# - … could even do the build steps if they are consistent for the apps (like `make`)
find apps* -maxdepth 2 -name .git -exec sh -c 'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout master && git pull --quiet && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged master | grep -v "master$" | xargs --no-run-if-empty git branch -d && git fetch --prune --quiet && cd ..' \;
find apps* -maxdepth 2 -name .git -exec sh -c 'cd {}/../ && printf "\n\033[1m${PWD##*/}\033[0m\n" && git checkout master && git pull --quiet -p && git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s" && printf "\n" && git branch --merged master | grep -v "master$" | xargs --no-run-if-empty git branch -d && git fetch --prune --quiet && cd ..' \;

View File

@ -6,7 +6,7 @@
# Update server
printf "\n\033[1m${PWD##*/}\033[0m\n"
git checkout master
git pull --quiet
git pull --quiet -p
git --no-pager log -3 --pretty=format:"%h %Cblue%ar%x09%an %Creset%s"
printf "\n"
git branch --merged master | grep -v "master$" | xargs --no-run-if-empty git branch -d