From 3ee3a5a70b959dacee703f7804546024b0f8d046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 16 Aug 2018 03:29:12 +0200 Subject: Update switch_all_submodules_to_head_and_clean + cleaning of temporary branches combined into one operation along with pull + this prevents additional communication with the remote server + all remote servers will be fetched and also pruned MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 9bb83bf90c6f1b1b1034af1af47a26fa1970ec5b) --- switch_all_submodules_to_head_and_clean | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'switch_all_submodules_to_head_and_clean') diff --git a/switch_all_submodules_to_head_and_clean b/switch_all_submodules_to_head_and_clean index c3fbde6..052ef59 100755 --- a/switch_all_submodules_to_head_and_clean +++ b/switch_all_submodules_to_head_and_clean @@ -67,12 +67,11 @@ updateModule() { git clean -dxff fi git checkout $branch - git pull --rebase $GIT_NO_RECURSE_SUBMODULES + git pull --rebase --all --prune $GIT_NO_RECURSE_SUBMODULES if [[ ! -z "`git status --porcelain $GIT_IGNORE_SUBMODULES`" ]]; then git reset --hard HEAD git clean -dxff fi - git remote prune origin if [[ -e $PARENTDIR/$MODULE.gitmodules ]]; then if [[ $gituser == "anonymous" ]]; then -- cgit v1.2.1