From 5e783f87d5f64b743965ab62be39b15492a9b0a0 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 19 Mar 2018 17:35:03 -0400 Subject: [PATCH] Don't checkout the master branch of submodules so the version specified by the repo is used --- update | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/update b/update index 72ab207..41c3f42 100755 --- a/update +++ b/update @@ -182,17 +182,6 @@ else error 'git submodule foreach git fetch --all' "Git failed to fetch the submodules from their respective remotes" "$process_status" fi -# run 'git checkout origin/master' on each submodule -printf '%s' "$cbg_blue $c_reset$cbg_yellow + Checkout updates:$c_reset" -process_status="$(git submodule foreach git checkout -f origin/master 2>&1)" - -if (( ! $? )); then - printf '%s\n' "$cfg_green_bold SUCCESS! $c_reset" -else - printf '%s\n' "$cfg_red_bold FAIL! $c_reset" - error 'git submodule foreach git checkout -f origin/master' 'Git failed to checkout the submodules into origin/master' "$process_status" -fi - # clean plugin directories and remove plugins no longer in the repo printf '\n%s\n' "$cbg_blue >> Clean plugin directories >> $c_reset" printf '%s' "$cbg_blue $c_reset$cbg_yellow + Remove untracked files:$c_reset"