From 83963a3b52484d59f144e0c930c2f13af8eaae36 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 20 Aug 2017 14:11:27 -0300
Subject: Inception: sync submodules

---
 inception | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'inception')

diff --git a/inception b/inception
index 3d536a3..2c0d2ff 100755
--- a/inception
+++ b/inception
@@ -22,6 +22,7 @@ function inception_init {
     cd $DIRNAME
 
     echo "Initializing submodules..."
+    $GIT submodule sync          --recursive
     $GIT submodule update --init --recursive
 
     if [ ! -e "$HOME/.dotfiles" ]; then
@@ -134,7 +135,11 @@ function inception_fetch {
 
 # Merge
 function inception_merge {
-  ( cd $DIRNAME && $GIT merge origin/master && $GIT submodule update --init --recursive )
+  (
+  cd $DIRNAME && $GIT merge origin/master                 && \\
+                 $GIT submodule sync          --recursive && \\
+                 $GIT submodule update --init --recursive
+  )
 }
 
 # Main
-- 
cgit v1.2.3