Prune remote branches before submodule update.

peter-b · peter-b · commit c760e2bee5de · 2015-11-04T17:13:35.000Z
Attempting to update branches that don't exist in the remote
repository any more will cause problems.
diff --git a/tools/update_submodules.py b/tools/update_submodules.py
@@ -201,8 +201,9 @@ def process_repository(path, remote, branches=None):
     # Make sure all submodules have been initialised and checked out
     init_submodules(path)
 
-    # Fetch from the remote
-    cmd = ['fetch', remote]
+    # Fetch from the remote, removing any branches that don't exist
+    # any more.
+    cmd = ['fetch', '--prune', remote]
     git_cmd(path, cmd)
 
     # Process each branch
