diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2018-08-16 03:29:12 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2018-08-16 03:29:24 +0200 |
| commit | 3ee3a5a70b959dacee703f7804546024b0f8d046 (patch) | |
| tree | 7bb141279672bb85260a7a419b9a3793ab39a4ea /switch_all_submodules_to_head_and_clean | |
| parent | 9be6e5e6f0f6396ac1922247a0718aadcadafe06 (diff) | |
| download | scripts-3ee3a5a70b959dacee703f7804546024b0f8d046.tar.gz scripts-3ee3a5a70b959dacee703f7804546024b0f8d046.zip | |
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
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9bb83bf90c6f1b1b1034af1af47a26fa1970ec5b)
Diffstat (limited to 'switch_all_submodules_to_head_and_clean')
| -rwxr-xr-x | switch_all_submodules_to_head_and_clean | 3 |
1 files changed, 1 insertions, 2 deletions
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 |