diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2019-05-14 15:08:38 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2019-05-17 22:49:39 +0200 |
| commit | bc61b15e2f4f724d68dfed1a0ad0707b5266faef (patch) | |
| tree | 0103a0049cc981042ecedaaf175f125f239030f6 | |
| parent | 934924577a13e95f688f222e3cf59687f74a8ab8 (diff) | |
| download | nextcloud-server-bc61b15e2f4f724d68dfed1a0ad0707b5266faef.tar.gz nextcloud-server-bc61b15e2f4f724d68dfed1a0ad0707b5266faef.zip | |
Adjust script to remove branches which are deleted on GitHub
Co-Authored-By: Morris Jobke <hey@morrisjobke.de>
| -rwxr-xr-x | build/update-apps.sh | 2 | ||||
| -rwxr-xr-x | build/update.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/update-apps.sh b/build/update-apps.sh index 03fff70a3a6..f2f2810c24f 100755 --- a/build/update-apps.sh +++ b/build/update-apps.sh @@ -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 ..' \; diff --git a/build/update.sh b/build/update.sh index 8c52ea7a799..99961550119 100755 --- a/build/update.sh +++ b/build/update.sh @@ -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 |