diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2019-05-15 12:38:53 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2019-05-17 22:49:39 +0200 |
| commit | 8f0656aae9dabc256752914aa78761ea72fca575 (patch) | |
| tree | 972db6c0514e4362a71d61a2b0fd544e8fd2b1eb | |
| parent | bc61b15e2f4f724d68dfed1a0ad0707b5266faef (diff) | |
| download | nextcloud-server-8f0656aae9dabc256752914aa78761ea72fca575.tar.gz nextcloud-server-8f0656aae9dabc256752914aa78761ea72fca575.zip | |
Remove eduplicate git fetch from update scripts
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| -rwxr-xr-x | build/update-apps.sh | 2 | ||||
| -rwxr-xr-x | build/update.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/build/update-apps.sh b/build/update-apps.sh index f2f2810c24f..060cfe0fdca 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 -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 ..' \; +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 && cd ..' \; diff --git a/build/update.sh b/build/update.sh index 99961550119..ef4c7e3b76b 100755 --- a/build/update.sh +++ b/build/update.sh @@ -10,7 +10,6 @@ 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 git submodule update --init # Update apps |